Incorrectly placed extension directive is an error

The ESSL 1.00 spec states "...the extension directives must occur before any non-preprocessor tokens." This change makes the occurance of an extension directive after non-preprocessor tokens a compilation error. Bug: angleproject:3285 Change-Id: I9f8631366151c92fb6d8b4408596917012d9a3e9 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1565411Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Tobin Ehlis <tobine@google.com>

Incorrectly placed extension directive is an error
9af10e8a · Tobin Ehlis · Commit Bot · 0de5b648 · 9af10e8a · 9af10e8a
Commit 9af10e8a authored Apr 11, 2019 by Tobin Ehlis Committed by Commit Bot Apr 12, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

DiagnosticsBase.h src/compiler/preprocessor/DiagnosticsBase.h +1 -1

deqp_gles2_test_expectations.txt src/tests/deqp_support/deqp_gles2_test_expectations.txt +0 -2

No files found.
--- a/src/compiler/preprocessor/DiagnosticsBase.h
+++ b/src/compiler/preprocessor/DiagnosticsBase.h
@@ -64,6 +64,7 @@ class Diagnostics
        PP_INVALID_LINE_NUMBER,
        PP_INVALID_FILE_NUMBER,
        PP_INVALID_LINE_DIRECTIVE,
+        PP_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL1,
        PP_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL3,
        PP_UNDEFINED_SHIFT,
        PP_TOKENIZER_ERROR,
@@ -72,7 +73,6 @@ class Diagnostics
        PP_WARNING_BEGIN,
        PP_EOF_IN_DIRECTIVE,
        PP_UNRECOGNIZED_PRAGMA,
-        PP_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL1,
        PP_WARNING_MACRO_NAME_RESERVED,
        PP_WARNING_END
    };

--- a/src/tests/deqp_support/deqp_gles2_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_gles2_test_expectations.txt
@@ -87,8 +87,6 @@
 // Shader failures.
 3285 : dEQP-GLES2.functional.shaders.preprocessor.pragmas.pragma_fragment = FAIL
-3285 : dEQP-GLES2.functional.shaders.preprocessor.extensions.after_non_preprocessing_tokens_vertex = FAIL
-3285 : dEQP-GLES2.functional.shaders.preprocessor.extensions.after_non_preprocessing_tokens_fragment = FAIL
 3287 : dEQP-GLES2.functional.shaders.scoping.valid.local_variable_hides_function_parameter_vertex = FAIL
 3287 : dEQP-GLES2.functional.shaders.scoping.valid.local_variable_hides_function_parameter_fragment = FAIL