ES31: Add shader version check for CS and GS

src/compiler/translator/Compiler.cpp

@@ -353,9 +353,8 @@ TIntermBlock *TCompiler::compileTreeImpl(const char *const shaderStrings[],
 
     setASTMetadata(parseContext);
 
-    if (MapSpecToShaderVersion(shaderSpec) < shaderVersion)
+    if (!checkShaderVersion(&parseContext))
     {
-        mDiagnostics.globalError("unsupported shader version");
         return nullptr;
     }
 
@@ -368,6 +367,50 @@ TIntermBlock *TCompiler::compileTreeImpl(const char *const shaderStrings[],
     return root;
 }
 
+bool TCompiler::checkShaderVersion(TParseContext *parseContext)
+{
+    if (MapSpecToShaderVersion(shaderSpec) < shaderVersion)
+    {
+        mDiagnostics.globalError("unsupported shader version");
+        return false;
+    }
+
+    ASSERT(parseContext);
+    switch (shaderType)
+    {
+        case GL_COMPUTE_SHADER:
+            if (shaderVersion < 310)
+            {
+                mDiagnostics.globalError("Compute shader is not supported in this shader version.");
+                return false;
+            }
+            break;
+
+        case GL_GEOMETRY_SHADER_EXT:
+            if (shaderVersion < 310)
+            {
+                mDiagnostics.globalError(
+                    "Geometry shader is not supported in this shader version.");
+                return false;
+            }
+            else
+            {
+                ASSERT(shaderVersion == 310);
+                if (!parseContext->checkCanUseExtension(sh::TSourceLoc(),
+                                                        TExtension::EXT_geometry_shader))
+                {
+                    return false;
+                }
+            }
+            break;
+
+        default:
+            break;
+    }
+
+    return true;
+}
+
 void TCompiler::setASTMetadata(const TParseContext &parseContext)
 {
     shaderVersion = parseContext.getShaderVersion();

src/compiler/translator/Compiler.h

@@ -228,6 +228,9 @@ class TCompiler : public TShHandleBase
     // version.
     void setASTMetadata(const TParseContext &parseContext);
 
+    // Check if shader version meets the requirement.
+    bool checkShaderVersion(TParseContext *parseContext);
+
     // Does checks that need to be run after parsing is complete and returns true if they pass.
     bool checkAndSimplifyAST(TIntermBlock *root,
                              const TParseContext &parseContext,

src/tests/compiler_tests/GeometryShader_test.cpp

@@ -127,8 +127,6 @@ TEST_F(GeometryShaderTest, Version300)
 {
     const std::string &shaderString =
         R"(#version 300 es
-        layout(points) in;
-        layout(points, max_vertices = 1) out;
         void main()
         {
         })";
@@ -145,8 +143,23 @@ TEST_F(GeometryShaderTest, Version310WithoutExtension)
 {
     const std::string &shaderString =
         R"(#version 310 es
-        layout(points) in;
-        layout(points, max_vertices = 1) out;
+        void main()
+        {
+        })";
+
+    if (compile(shaderString))
+    {
+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
+    }
+}
+
+// Geometry Shaders are not supported in GLSL ES shaders version 310 with extension
+// EXT_geometry_shader disabled.
+TEST_F(GeometryShaderTest, Version310ExtensionDisabled)
+{
+    const std::string &shaderString =
+        R"(#version 310 es
+        #extension GL_EXT_geometry_shader : disable
         void main()
         {
         })";
@@ -158,7 +171,7 @@ TEST_F(GeometryShaderTest, Version310WithoutExtension)
 }
 
 // Geometry Shaders are supported in GLSL ES shaders version 310 with EXT_geometry_shader enabled.
-TEST_F(GeometryShaderTest, Version310WithOESExtension)
+TEST_F(GeometryShaderTest, Version310WithEXTExtension)
 {
     const std::string &shaderString =
         R"(#version 310 es

src/tests/compiler_tests/ShaderValidation_test.cpp

@@ -1748,10 +1748,9 @@ TEST_F(FragmentShaderValidationTest, StructEqDifferentStruct)
 TEST_F(ComputeShaderValidationTest, Version100)
 {
     const std::string &shaderString =
-        "void main()\n"
-        "layout(local_size_x=1) in;\n"
-        "{\n"
-        "}\n";
+        R"(void main()
+        {
+        })";
     if (compile(shaderString))
     {
         FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
@@ -1762,11 +1761,10 @@ TEST_F(ComputeShaderValidationTest, Version100)
 TEST_F(ComputeShaderValidationTest, Version300)
 {
     const std::string &shaderString =
-        "#version 300 es\n"
-        "void main()\n"
-        "layout(local_size_x=1) in;\n"
-        "{\n"
-        "}\n";
+        R"(#version 300 es
+        void main()
+        {
+        })";
     if (compile(shaderString))
     {
         FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;

src/tests/compiler_tests/WEBGL_multiview_test.cpp

@@ -688,11 +688,11 @@ TEST_F(WEBGLMultiviewFragmentShaderOutputCodeTest, ViewportArray2IsNotEmitted)
 TEST_F(WEBGLMultiviewComputeShaderOutputCodeTest, ViewportArray2IsNotEmitted)
 {
     const std::string &shaderString =
-        "#version 300 es\n"
-        "#extension GL_OVR_multiview : require\n"
-        "void main()\n"
-        "{\n"
-        "}\n";
+        R"(#version 310 es
+        #extension GL_OVR_multiview : require
+        void main()
+        {
+        })";
     compile(shaderString, SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW |
                               SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER);
     EXPECT_FALSE(foundInGLSLCode("#extension GL_NV_viewport_array2"));