Only support GL_OVR_multiview extension variant

src/compiler.gypi

@@ -145,8 +145,6 @@
             'compiler/translator/ValidateLimitations.h',
             'compiler/translator/ValidateMaxParameters.h',
             'compiler/translator/ValidateMaxParameters.cpp',
-            'compiler/translator/ValidateMultiviewWebGL.cpp',
-            'compiler/translator/ValidateMultiviewWebGL.h',
             'compiler/translator/ValidateOutputs.cpp',
             'compiler/translator/ValidateOutputs.h',
             'compiler/translator/ValidateSwitch.cpp',

src/compiler/translator/CollectVariables.cpp

@@ -527,8 +527,7 @@ void CollectVariablesTraverser::visitSymbol(TIntermSymbol *symbol)
                 else
                 {
                     ASSERT(mShaderType == GL_VERTEX_SHADER &&
-                           (IsExtensionEnabled(mExtensionBehavior, "GL_OVR_multiview") ||
-                            IsExtensionEnabled(mExtensionBehavior, "GL_OVR_multiview2")));
+                           IsExtensionEnabled(mExtensionBehavior, "GL_OVR_multiview"));
                 }
                 break;
             default:

src/compiler/translator/Compiler.cpp

@@ -37,7 +37,6 @@
 #include "compiler/translator/UseInterfaceBlockFields.h"
 #include "compiler/translator/ValidateLimitations.h"
 #include "compiler/translator/ValidateMaxParameters.h"
-#include "compiler/translator/ValidateMultiviewWebGL.h"
 #include "compiler/translator/ValidateOutputs.h"
 #include "compiler/translator/VariablePacker.h"
 #include "third_party/compiler/ArrayBoundsClamper.h"
@@ -359,15 +358,6 @@ TIntermBlock *TCompiler::compileTreeImpl(const char *const shaderStrings[],
         // Highp might have been auto-enabled based on shader version
         fragmentPrecisionHigh = parseContext.getFragmentPrecisionHigh();
 
-        if (success && (IsWebGLBasedSpec(shaderSpec) &&
-                        IsExtensionEnabled(extensionBehavior, "GL_OVR_multiview") &&
-                        IsExtensionEnabled(extensionBehavior, "GL_OVR_multiview2")))
-        {
-            // Can't enable both extensions at the same time.
-            mDiagnostics.globalError("Can't enable both OVR_multiview and OVR_multiview2");
-            success = false;
-        }
-
         if (success && shaderType == GL_GEOMETRY_SHADER_OES)
         {
             mGeometryShaderInputPrimitiveType = parseContext.getGeometryShaderInputPrimitiveType();
@@ -414,12 +404,6 @@ TIntermBlock *TCompiler::compileTreeImpl(const char *const shaderStrings[],
             success =
                 ValidateLimitations(root, shaderType, &symbolTable, shaderVersion, &mDiagnostics);
 
-        bool multiview2 = IsExtensionEnabled(extensionBehavior, "GL_OVR_multiview2");
-        if (success && compileResources.OVR_multiview && IsWebGLBasedSpec(shaderSpec) &&
-            (IsExtensionEnabled(extensionBehavior, "GL_OVR_multiview") || multiview2))
-            success = ValidateMultiviewWebGL(root, shaderType, symbolTable, shaderVersion,
-                                             multiview2, &mDiagnostics);
-
         // Fail compilation if precision emulation not supported.
         if (success && getResources().WEBGL_debug_shader_precision &&
             getPragma().debugShaderPrecision)

src/compiler/translator/Initialize.cpp

@@ -1021,8 +1021,7 @@ void InitExtensionBehavior(const ShBuiltInResources &resources, TExtensionBehavi
         extBehavior["GL_ARM_shader_framebuffer_fetch"] = EBhUndefined;
     if (resources.OVR_multiview)
     {
-        extBehavior["GL_OVR_multiview"]  = EBhUndefined;
-        extBehavior["GL_OVR_multiview2"] = EBhUndefined;
+        extBehavior["GL_OVR_multiview"] = EBhUndefined;
     }
     if (resources.EXT_YUV_target)
     {

src/compiler/translator/OutputHLSL.cpp

@@ -130,8 +130,7 @@ OutputHLSL::OutputHLSL(sh::GLenum shaderType,
     mUsesFrontFacing             = false;
     mUsesPointSize               = false;
     mUsesInstanceID              = false;
-    mHasMultiviewExtensionEnabled = IsExtensionEnabled(mExtensionBehavior, "GL_OVR_multiview") ||
-                                    IsExtensionEnabled(mExtensionBehavior, "GL_OVR_multiview2");
+    mHasMultiviewExtensionEnabled = IsExtensionEnabled(mExtensionBehavior, "GL_OVR_multiview");
     mUsesViewID                  = false;
     mUsesVertexID                = false;
     mUsesFragDepth               = false;

src/compiler/translator/ParseContext.cpp

@@ -1158,12 +1158,6 @@ bool TParseContext::checkCanUseExtension(const TSourceLoc &line, const TString &
     // In GLSL ES, an extension's default behavior is "disable".
     if (iter->second == EBhDisable || iter->second == EBhUndefined)
     {
-        // TODO(oetuaho@nvidia.com): This is slightly hacky. Might be better if symbols could be
-        // associated with more than one extension.
-        if (extension == "GL_OVR_multiview")
-        {
-            return checkCanUseExtension(line, "GL_OVR_multiview2");
-        }
         error(line, "extension is disabled", extension.c_str());
         return false;
     }
@@ -1776,14 +1770,6 @@ TIntermTyped *TParseContext::parseVariableIdentifier(const TSourceLoc &location,
         return node;
     }
 
-    if (variable->getType().getQualifier() == EvqViewIDOVR && IsWebGLBasedSpec(mShaderSpec) &&
-        mShaderType == GL_FRAGMENT_SHADER && !isExtensionEnabled("GL_OVR_multiview2"))
-    {
-        // WEBGL_multiview spec
-        error(location, "Need to enable OVR_multiview2 to use gl_ViewID_OVR in fragment shader",
-              "gl_ViewID_OVR");
-    }
-
     TIntermTyped *node = nullptr;
 
     if (variable->getConstPointer())

src/compiler/translator/ParseContext.h

@@ -172,8 +172,7 @@ class TParseContext : angle::NonCopyable
     bool isExtensionEnabled(const char *extension) const;
     bool isMultiviewExtensionEnabled() const
     {
-        return mMultiviewAvailable &&
-               (isExtensionEnabled("GL_OVR_multiview") || isExtensionEnabled("GL_OVR_multiview2"));
+        return mMultiviewAvailable && isExtensionEnabled("GL_OVR_multiview");
     }
     void handleExtensionDirective(const TSourceLoc &loc, const char *extName, const char *behavior);
     void handlePragmaDirective(const TSourceLoc &loc,

src/compiler/translator/TranslatorESSL.cpp

@@ -136,8 +136,7 @@ void TranslatorESSL::writeExtensionBehavior(ShCompileOptions compileOptions)
     {
         if (iter->second != EBhUndefined)
         {
-            const bool isMultiview =
-                iter->first == "GL_OVR_multiview" || iter->first == "GL_OVR_multiview2";
+            const bool isMultiview = (iter->first == "GL_OVR_multiview");
             if (getResources().NV_shader_framebuffer_fetch &&
                 iter->first == "GL_EXT_shader_framebuffer_fetch")
             {

src/compiler/translator/TranslatorGLSL.cpp

@@ -283,8 +283,7 @@ void TranslatorGLSL::writeExtensionBehavior(TIntermNode *root, ShCompileOptions
             }
         }
 
-        const bool isMultiview =
-            iter.first == "GL_OVR_multiview" || iter.first == "GL_OVR_multiview2";
+        const bool isMultiview = (iter.first == "GL_OVR_multiview");
         if (isMultiview && getShaderType() == GL_VERTEX_SHADER &&
             (compileOptions & SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER) != 0u)
         {

src/compiler/translator/ValidateMultiviewWebGL.h

-//
-// Copyright (c) 2002-2016 The ANGLE Project Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-// ValidateMultiviewWebGL.h:
-//   Validate the AST according to rules in the WEBGL_multiview extension spec. Only covers those
-//   rules not already covered in ParseContext.
-//
-
-#ifndef COMPILER_TRANSLATOR_VALIDATEMULTIVIEWWEBGL_H_
-#define COMPILER_TRANSLATOR_VALIDATEMULTIVIEWWEBGL_H_
-
-#include "GLSLANG/ShaderVars.h"
-
-namespace sh
-{
-class TDiagnostics;
-class TIntermBlock;
-class TSymbolTable;
-
-// Check for errors and output error messages with diagnostics.
-// Returns true if there are no errors.
-bool ValidateMultiviewWebGL(TIntermBlock *root,
-                            sh::GLenum shaderType,
-                            const TSymbolTable &symbolTable,
-                            int shaderVersion,
-                            bool multiview2,
-                            TDiagnostics *diagnostics);
-
-}  // namespace sh
-
-#endif  // COMPILER_TRANSLATOR_VALIDATEMULTIVIEWWEBGL_H_

src/tests/gl_tests/MultiviewDrawTest.cpp

@@ -830,7 +830,7 @@ TEST_P(MultiviewRenderTest, DrawArraysFourViews)
 
     const std::string vsSource =
         "#version 300 es\n"
-        "#extension GL_OVR_multiview2 : require\n"
+        "#extension GL_OVR_multiview : require\n"
         "layout(num_views = 4) in;\n"
         "in vec4 vPosition;\n"
         "void main()\n"
@@ -849,7 +849,7 @@ TEST_P(MultiviewRenderTest, DrawArraysFourViews)
 
     const std::string fsSource =
         "#version 300 es\n"
-        "#extension GL_OVR_multiview2 : require\n"
+        "#extension GL_OVR_multiview : require\n"
         "precision mediump float;\n"
         "out vec4 col;\n"
         "void main()\n"
@@ -958,7 +958,7 @@ TEST_P(MultiviewRenderTest, AttribDivisor)
 
     const std::string &vsSource =
         "#version 300 es\n"
-        "#extension GL_OVR_multiview2 : require\n"
+        "#extension GL_OVR_multiview : require\n"
         "layout(num_views = 2) in;\n"
         "in vec3 vPosition;\n"
         "in float offsetX;\n"
@@ -973,7 +973,7 @@ TEST_P(MultiviewRenderTest, AttribDivisor)
 
     const std::string &fsSource =
         "#version 300 es\n"
-        "#extension GL_OVR_multiview2 : require\n"
+        "#extension GL_OVR_multiview : require\n"
         "precision mediump float;\n"
         "out vec4 col;\n"
         "void main()\n"
@@ -1039,7 +1039,7 @@ TEST_P(MultiviewRenderTest, DivisorOrderOfOperation)
     // Create multiview program.
     const std::string &vs =
         "#version 300 es\n"
-        "#extension GL_OVR_multiview2 : require\n"
+        "#extension GL_OVR_multiview : require\n"
         "layout(num_views = 2) in;\n"
         "layout(location = 0) in vec2 vPosition;\n"
         "layout(location = 1) in float offsetX;\n"
@@ -1052,7 +1052,7 @@ TEST_P(MultiviewRenderTest, DivisorOrderOfOperation)
 
     const std::string &fs =
         "#version 300 es\n"
-        "#extension GL_OVR_multiview2 : require\n"
+        "#extension GL_OVR_multiview : require\n"
         "precision mediump float;\n"
         "out vec4 col;\n"
         "void main()\n"
@@ -1331,7 +1331,7 @@ TEST_P(MultiviewProgramGenerationTest, UseViewIDInVertexShader)
 
     const std::string vsSource =
         "#version 300 es\n"
-        "#extension GL_OVR_multiview2 : require\n"
+        "#extension GL_OVR_multiview : require\n"
         "layout(num_views = 2) in;\n"
         "void main()\n"
         "{\n"
@@ -1344,7 +1344,7 @@ TEST_P(MultiviewProgramGenerationTest, UseViewIDInVertexShader)
 
     const std::string fsSource =
         "#version 300 es\n"
-        "#extension GL_OVR_multiview2 : require\n"
+        "#extension GL_OVR_multiview : require\n"
         "precision mediump float;\n"
         "void main()\n"
         "{\n"
@@ -1367,7 +1367,7 @@ TEST_P(MultiviewProgramGenerationTest, UseViewIDInFragmentShader)
 
     const std::string vsSource =
         "#version 300 es\n"
-        "#extension GL_OVR_multiview2 : require\n"
+        "#extension GL_OVR_multiview : require\n"
         "layout(num_views = 2) in;\n"
         "void main()\n"
         "{\n"
@@ -1375,7 +1375,7 @@ TEST_P(MultiviewProgramGenerationTest, UseViewIDInFragmentShader)
 
     const std::string fsSource =
         "#version 300 es\n"
-        "#extension GL_OVR_multiview2 : require\n"
+        "#extension GL_OVR_multiview : require\n"
         "precision mediump float;\n"
         "out vec4 col;\n"
         "void main()\n"
@@ -1639,7 +1639,7 @@ TEST_P(MultiviewSideBySideRenderTest, NoLeakingFragments)
 
     const std::string vsSource =
         "#version 300 es\n"
-        "#extension GL_OVR_multiview2 : require\n"
+        "#extension GL_OVR_multiview : require\n"
         "layout(num_views = 2) in;\n"
         "layout(location=0) in vec2 vPosition;\n"
         "void main()\n"
@@ -1650,7 +1650,7 @@ TEST_P(MultiviewSideBySideRenderTest, NoLeakingFragments)
 
     const std::string fsSource =
         "#version 300 es\n"
-        "#extension GL_OVR_multiview2 : require\n"
+        "#extension GL_OVR_multiview : require\n"
         "precision mediump float;\n"
         "out vec4 col;\n"
         "void main()\n"
@@ -1713,7 +1713,7 @@ TEST_P(MultiviewRenderTest, ProgramRelinkUpdatesAttribDivisor)
 
     const std::string &fsSource =
         "#version 300 es\n"
-        "#extension GL_OVR_multiview2 : require\n"
+        "#extension GL_OVR_multiview : require\n"
         "precision mediump float;\n"
         "in vec4 oColor;\n"
         "out vec4 col;\n"
@@ -1725,7 +1725,7 @@ TEST_P(MultiviewRenderTest, ProgramRelinkUpdatesAttribDivisor)
     auto generateVertexShaderSource = [](int numViews) -> std::string {
         std::string source =
             "#version 300 es\n"
-            "#extension GL_OVR_multiview2 : require\n"
+            "#extension GL_OVR_multiview : require\n"
             "layout(num_views = " +
             ToString(numViews) +
             ") in;\n"
@@ -1895,7 +1895,7 @@ TEST_P(MultiviewRenderTest, SelectColorBasedOnViewIDOVR)
 
     const std::string vsSource =
         "#version 300 es\n"
-        "#extension GL_OVR_multiview2 : require\n"
+        "#extension GL_OVR_multiview : require\n"
         "layout(num_views = 3) in;\n"
         "in vec3 vPosition;\n"
         "void main()\n"
@@ -1905,7 +1905,7 @@ TEST_P(MultiviewRenderTest, SelectColorBasedOnViewIDOVR)
 
     const std::string fsSource =
         "#version 300 es\n"
-        "#extension GL_OVR_multiview2 : require\n"
+        "#extension GL_OVR_multiview : require\n"
         "precision mediump float;\n"
         "out vec4 col;\n"
         "void main()\n"
@@ -1994,7 +1994,7 @@ TEST_P(MultiviewRenderTest, FlatInterpolation)
 
     const std::string vsSource =
         "#version 300 es\n"
-        "#extension GL_OVR_multiview2 : require\n"
+        "#extension GL_OVR_multiview : require\n"
         "layout(num_views = 2) in;\n"
         "in vec3 vPosition;\n"
         "flat out int oInstanceID;\n"
@@ -2006,7 +2006,7 @@ TEST_P(MultiviewRenderTest, FlatInterpolation)
 
     const std::string fsSource =
         "#version 300 es\n"
-        "#extension GL_OVR_multiview2 : require\n"
+        "#extension GL_OVR_multiview : require\n"
         "precision mediump float;\n"
         "flat in int oInstanceID;\n"
         "out vec4 col;\n"