commit 335d8bf2f2220d6dc2f3f821f587c04ee5223fa1
author Bryan Bernhart (Intel Americas Inc) <bryan.bernhart@intel.com> Mon Oct 23 15:41:43 2017 -0700
committer Commit Bot <commit-bot@chromium.org> Thu Oct 26 21:59:40 2017 +0000
tree 1adfda6c75a7b06d5382afcbbb71b6da86d68e02
parent c4f1dd83ffb1a52f29d7ddcf0082905e2f231966

WebGLCompatibility: Fix shader validation using define macros.

Backslash as line-continutation character is not permitted to be used
within a pre-processor directive for WebGL1.

BUG=angleproject:2093

Change-Id: I649a914b9bc544a3e4f9e7eff23b95a62c9b7008
Reviewed-on: https://chromium-review.googlesource.com/734218
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Bryan Bernhart <bryan.bernhart@intel.com>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/validationES2.cpp

diff --git a/src/libANGLE/validationES2.cpp b/src/libANGLE/validationES2.cpp
index baec2cc..af7d7ec 100644
--- a/src/libANGLE/validationES2.cpp
+++ b/src/libANGLE/validationES2.cpp
@@ -919,8 +919,12 @@
                 break;
 
             case ParseState::IN_PREPROCESSOR_DIRECTIVE:
-                // No matter what the character is, just pass it
-                // through. Do not parse comments in this state.
+                // Line-continuation characters may not be permitted.
+                // Otherwise, just pass it through. Do not parse comments in this state.
+                if (!lineContinuationAllowed && c == '\\')
+                {
+                    return false;
+                }
                 pos++;
                 break;