Merge ESSL pre-processsor token errors

src/compiler/preprocessor/DiagnosticsBase.cpp

@@ -115,10 +115,8 @@ const char *Diagnostics::message(ID id)
             return "invalid file number";
         case PP_INVALID_LINE_DIRECTIVE:
             return "invalid line directive";
-        case PP_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL1:
-            return "extension directive must occur before any non-preprocessor tokens in ESSL1";
-        case PP_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL3:
-            return "extension directive must occur before any non-preprocessor tokens in ESSL3";
+        case PP_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL:
+            return "extension directive must occur before any non-preprocessor tokens in ESSL";
         case PP_UNDEFINED_SHIFT:
             return "shift exponent is negative or undefined";
         case PP_TOKENIZER_ERROR:

src/compiler/preprocessor/DiagnosticsBase.h

@@ -64,8 +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_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL,
         PP_UNDEFINED_SHIFT,
         PP_TOKENIZER_ERROR,
         PP_ERROR_END,

src/compiler/preprocessor/DirectiveParser.cpp

@@ -668,24 +668,16 @@ void DirectiveParser::parseExtension(Token *token)
     }
     if (valid && mSeenNonPreprocessorToken)
     {
-        if (mShaderVersion >= 300)
+        if (mSettings.shaderSpec == SH_WEBGL_SPEC && mShaderVersion < 300)
         {
-            mDiagnostics->report(Diagnostics::PP_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL3,
+            mDiagnostics->report(Diagnostics::PP_NON_PP_TOKEN_BEFORE_EXTENSION_WEBGL,
                                  token->location, token->text);
-            valid = false;
         }
         else
         {
-            if (mSettings.shaderSpec == SH_WEBGL_SPEC)
-            {
-                mDiagnostics->report(Diagnostics::PP_NON_PP_TOKEN_BEFORE_EXTENSION_WEBGL,
-                                     token->location, token->text);
-            }
-            else
-            {
-                mDiagnostics->report(Diagnostics::PP_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL1,
-                                     token->location, token->text);
-            }
+            mDiagnostics->report(Diagnostics::PP_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL,
+                                 token->location, token->text);
+            valid = false;
         }
     }
     if (valid)

src/tests/preprocessor_tests/extension_test.cpp

@@ -74,10 +74,8 @@ TEST_F(ExtensionTest, ExtensionAfterNonPreProcessorTokenESSL1)
     const char *expected = "int baz = 1;\n\n";
 
     using testing::_;
-    // Directive successfully parsed.
-    EXPECT_CALL(mDirectiveHandler, handleExtension(pp::SourceLocation(0, 2), "foo", "bar"));
-    // Expect a warning about extension pragmas after non-preprocessor tokens.
-    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL1, _, _));
+    // Expect an error about extension pragmas after non-preprocessor tokens.
+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL, _, _));
 
     preprocess(str, expected);
 }
@@ -93,8 +91,8 @@ TEST_F(ExtensionTest, ExtensionAfterNonPreProcessorTokenESSL3)
     using testing::_;
     // Directive successfully parsed.
     EXPECT_CALL(mDirectiveHandler, handleVersion(pp::SourceLocation(0, 1), 300));
-    // Expect a error about extension pragmas after non-preprocessor tokens.
-    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL3, _, _));
+    // Expect an error about extension pragmas after non-preprocessor tokens.
+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL, _, _));
 
     preprocess(str, expected);
 }