Enable shader validation with WebGL compatibility extension.

CONTRIBUTORS

@@ -68,6 +68,7 @@ Intel Corporation
  Jiawei Shao
  Jie Chen
  Qiankun Miao
+ Bryan Bernhart
 
 Klarälvdalens Datakonsult AB
  Milian Wolff

src/libANGLE/Compiler.cpp

@@ -23,27 +23,29 @@ namespace
 // ShFinalize.
 size_t activeCompilerHandles = 0;
 
-ShShaderSpec SelectShaderSpec(GLint majorVersion, GLint minorVersion)
+ShShaderSpec SelectShaderSpec(GLint majorVersion, GLint minorVersion, bool isWebGL)
 {
     if (majorVersion >= 3)
     {
         if (minorVersion == 1)
         {
-            return SH_GLES3_1_SPEC;
+            return isWebGL ? SH_WEBGL3_SPEC : SH_GLES3_1_SPEC;
         }
         else
         {
-            return SH_GLES3_SPEC;
+            return isWebGL ? SH_WEBGL2_SPEC : SH_GLES3_SPEC;
         }
     }
-    return SH_GLES2_SPEC;
+    return isWebGL ? SH_WEBGL_SPEC : SH_GLES2_SPEC;
 }
 
 }  // anonymous namespace
 
 Compiler::Compiler(rx::GLImplFactory *implFactory, const ContextState &state)
     : mImplementation(implFactory->createCompiler()),
-      mSpec(SelectShaderSpec(state.getClientMajorVersion(), state.getClientMinorVersion())),
+      mSpec(SelectShaderSpec(state.getClientMajorVersion(),
+                             state.getClientMinorVersion(),
+                             state.getExtensions().webglCompatibility)),
       mOutputType(mImplementation->getTranslatorOutputType()),
       mResources(),
       mFragmentCompiler(nullptr),

src/tests/gl_tests/WebGLCompatibilityTest.cpp

@@ -112,6 +112,33 @@ TEST_P(WebGLCompatibilityTest, EnableExtensionUintIndices)
     }
 }
 
+// Verify that shaders are of a compatible spec when the extension is enabled.
+TEST_P(WebGLCompatibilityTest, ExtensionCompilerSpec)
+{
+    EXPECT_TRUE(extensionEnabled("GL_ANGLE_webgl_compatibility"));
+
+    // Use of reserved _webgl prefix should fail when the shader specification is for WebGL.
+    const std::string &vert =
+        "struct Foo {\n"
+        "    int _webgl_bar;\n"
+        "};\n"
+        "void main()\n"
+        "{\n"
+        "    Foo foo = Foo(1);\n"
+        "}";
+
+    // Default fragement shader.
+    const std::string &frag =
+        "void main()\n"
+        "{\n"
+        "    gl_FragColor = vec4(1.0,0.0,0.0,1.0);\n"
+        "}";
+
+    GLuint program = CompileProgram(vert, frag);
+    EXPECT_EQ(0u, program);
+    glDeleteProgram(program);
+}
+
 // Use this to select which configurations (e.g. which renderer, which GLES major version) these
 // tests should be run against.
 ANGLE_INSTANTIATE_TEST(WebGLCompatibilityTest,