Reserve "defined" as a macro name

After lengthy debate, the GLES working group recommended that this should be an error in WebGL, though old specs were not updated. Make ANGLE follow the WebGL spec and generate an error in this case. This breaks some dEQP tests which are not in line with the WebGL spec. BUG=angleproject:1335 TEST=WebGL conformance tests Change-Id: I93fc397094419ecbf6a1b5179631b72064149bd0 Reviewed-on: https://chromium-review.googlesource.com/352470Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

Reserve "defined" as a macro name
4d675ca2 · Olli Etuaho · Commit Bot · 163fa521 · 4d675ca2 · 4d675ca2
Commit 4d675ca2 authored Mar 07, 2016 by Olli Etuaho Committed by Commit Bot Jul 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

DirectiveParser.cpp src/compiler/preprocessor/DirectiveParser.cpp +2 -2

deqp_gles3_test_expectations.txt src/tests/deqp_support/deqp_gles3_test_expectations.txt +4 -0

No files found.
--- a/src/compiler/preprocessor/DirectiveParser.cpp
+++ b/src/compiler/preprocessor/DirectiveParser.cpp
@@ -118,8 +118,8 @@ void skipUntilEOD(pp::Lexer *lexer, pp::Token *token)
 bool isMacroNameReserved(const std::string &name)
 {
-    // Names prefixed with "GL_" are reserved.
+    // Names prefixed with "GL_" and the name "defined" are reserved.
-    return (name.substr(0, 3) == "GL_");
+    return name == "defined" || (name.substr(0, 3) == "GL_");
 }
 bool hasDoubleUnderscores(const std::string &name)

--- a/src/tests/deqp_support/deqp_gles3_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_gles3_test_expectations.txt
@@ -36,6 +36,10 @@
 // We can't support distinct texture sizes in D3D11.
 1097 WIN : dEQP-GLES3.functional.fbo.completeness.size.distinct = FAIL
+// Tests that we fail because they're not in line with the WebGL spec
+1335 MAC WIN LINUX : dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.define_defined* = FAIL
+1335 MAC WIN LINUX : dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.define_defined_outside_if* = FAIL
 ////////////////////////////////////////////////////////////////////////////////
 //
 //  Temporary entries: they should be removed once the bugs are fixed.