GL_OVR_multiview shouldn't be defined for WebGL spec'ed shaders

scripts/code_generation_hashes/ANGLE_shader_translator.json

@@ -4,11 +4,11 @@
   "src/compiler/translator/generate_parser.py":
     "566178ecdfae3a29803b3687fc518ebb",
   "src/compiler/translator/glslang.l":
-    "377199aacc754d2ffcc5016e99701228",
+    "2f602a853e4c4d669edc3cc36a1a8c4a",
   "src/compiler/translator/glslang.y":
     "928cfcdd99877b5a289694a4057d5d76",
   "src/compiler/translator/glslang_lex_autogen.cpp":
-    "883b81686c9b956fab24e85b9131081e",
+    "809307250ccc9a6c6d026da45b57dcec",
   "src/compiler/translator/glslang_tab_autogen.cpp":
     "f693228f495aac4629ee8e30c12dc62f",
   "src/compiler/translator/glslang_tab_autogen.h":

src/compiler/translator/glslang.l

@@ -804,6 +804,11 @@ int glslang_scan(size_t count, const char* const string[], const int length[],
     const TExtensionBehavior& extBehavior = context->extensionBehavior();
     for (TExtensionBehavior::const_iterator iter = extBehavior.begin();
          iter != extBehavior.end(); ++iter) {
+        // OVR_multiview should not be defined for WebGL spec'ed shaders.
+        if (sh::IsWebGLBasedSpec(context->getShaderSpec()) &&
+            iter->first == TExtension::OVR_multiview) {
+            continue;
+        }
         preprocessor->predefineMacro(GetExtensionNameString(iter->first), 1);
     }
     if (context->getFragmentPrecisionHigh())

src/compiler/translator/glslang_lex_autogen.cpp

@@ -3519,6 +3519,12 @@ int glslang_scan(size_t count,
     for (TExtensionBehavior::const_iterator iter = extBehavior.begin(); iter != extBehavior.end();
          ++iter)
     {
+        // OVR_multiview should not be defined for WebGL spec'ed shaders.
+        if (sh::IsWebGLBasedSpec(context->getShaderSpec()) &&
+            iter->first == TExtension::OVR_multiview)
+        {
+            continue;
+        }
         preprocessor->predefineMacro(GetExtensionNameString(iter->first), 1);
     }
     if (context->getFragmentPrecisionHigh())

src/tests/compiler_tests/OVR_multiview2_test.cpp

@@ -582,6 +582,25 @@ TEST_F(OVRMultiview2FragmentShaderTest, ViewIDDeclaredAsFlatInput)
     VariableOccursNTimes(mASTRoot, ImmutableString("ViewID_OVR"), EvqFlatIn, 1u);
 }
 
+// Test that GL_OVR_multiview is not defined by the preprocessor for WebGL spec shader;
+// Test that GL_OVR_multiview2 is defined by the preprocessor for WebGL spec shader.
+TEST_F(OVRMultiview2FragmentShaderTest, PreprocessorOutput)
+{
+    const std::string &shaderString =
+        "#version 300 es\n"
+        "#extension GL_OVR_multiview2 : require\n"
+        "#ifdef GL_OVR_multiview\n"
+        "    #error legacy GL_OVR_multiview support must be forbidden\n"
+        "#endif\n"
+        "#ifndef GL_OVR_multiview2\n"
+        "    #error GL_OVR_multiview2 support must be enabled\n"
+        "#endif\n"
+        "void main()\n"
+        "{\n"
+        "}\n";
+    compileAssumeSuccess(shaderString);
+}
+
 // Test that ViewID_OVR is declared as a flat output variable in an ESSL 1.00 vertex shader.
 TEST_F(OVRMultiview2VertexShaderTest, ViewIDDeclaredAsFlatOutput)
 {
@@ -595,6 +614,25 @@ TEST_F(OVRMultiview2VertexShaderTest, ViewIDDeclaredAsFlatOutput)
     VariableOccursNTimes(mASTRoot, ImmutableString("ViewID_OVR"), EvqFlatOut, 2u);
 }
 
+// Test that GL_OVR_multiview is not defined by the preprocessor for WebGL spec shader;
+// Test that GL_OVR_multiview2 is defined by the preprocessor for WebGL spec shader.
+TEST_F(OVRMultiview2VertexShaderTest, PreprocessorOutput)
+{
+    const std::string &shaderString =
+        "#version 300 es\n"
+        "#extension GL_OVR_multiview2 : require\n"
+        "#ifdef GL_OVR_multiview\n"
+        "    #error legacy GL_OVR_multiview support must be forbidden\n"
+        "#endif\n"
+        "#ifndef GL_OVR_multiview2\n"
+        "    #error GL_OVR_multiview2 support must be enabled\n"
+        "#endif\n"
+        "void main()\n"
+        "{\n"
+        "}\n";
+    compileAssumeSuccess(shaderString);
+}
+
 // The test checks that the GL_NV_viewport_array2 extension is emitted in a vertex shader if the
 // SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER option is set.
 TEST_F(OVRMultiview2VertexShaderOutputCodeTest, ViewportArray2IsEmitted)

src/tests/compiler_tests/OVR_multiview_test.cpp

@@ -94,7 +94,7 @@ class OVRMultiviewVertexShaderTest : public ShaderCompileTreeTest
 
   protected:
     ::GLenum getShaderType() const override { return GL_VERTEX_SHADER; }
-    ShShaderSpec getShaderSpec() const override { return SH_WEBGL3_SPEC; }
+    ShShaderSpec getShaderSpec() const override { return SH_GLES3_1_SPEC; }
     void initResources(ShBuiltInResources *resources) override
     {
         resources->OVR_multiview = 1;
@@ -109,7 +109,7 @@ class OVRMultiviewFragmentShaderTest : public ShaderCompileTreeTest
 
   protected:
     ::GLenum getShaderType() const override { return GL_FRAGMENT_SHADER; }
-    ShShaderSpec getShaderSpec() const override { return SH_WEBGL3_SPEC; }
+    ShShaderSpec getShaderSpec() const override { return SH_GLES3_1_SPEC; }
     void initResources(ShBuiltInResources *resources) override
     {
         resources->OVR_multiview = 1;