Fix shader support of OVR_multiview

Fix up incorrect capitalization of gl_ViewID_OVR in a few places. Also add extension macro test to compiler unit tests. BUG=angleproject:1669 TEST=angle_unittests Change-Id: Ia7fdd747ad08355cdc149db9e2e7911c2e673af5 Reviewed-on: https://chromium-review.googlesource.com/425851Reviewed-by: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

Fix shader support of OVR_multiview
2f90a9b5 · Olli Etuaho · Commit Bot · bb1db48e · 2f90a9b5 · 2f90a9b5
Commit 2f90a9b5 authored Jan 10, 2017 by Olli Etuaho Committed by Commit Bot Jan 10, 2017
4 changed files
--- a/src/compiler/translator/OutputGLSLBase.cpp
+++ b/src/compiler/translator/OutputGLSLBase.cpp
@@ -1143,7 +1143,7 @@ TString TOutputGLSLBase::hashVariableName(const TName &name)
        if (mCompileOptions & SH_TRANSLATE_VIEWID_OVR_TO_UNIFORM &&
            name.getString() == "gl_ViewID_OVR")
        {
-            TName uniformName(TString("ViewId_OVR"));
+            TName uniformName(TString("ViewID_OVR"));
            uniformName.setInternal(true);
            return hashName(uniformName);
        }

--- a/src/compiler/translator/TranslatorESSL.cpp
+++ b/src/compiler/translator/TranslatorESSL.cpp
@@ -97,7 +97,7 @@ void TranslatorESSL::translate(TIntermNode *root, ShCompileOptions compileOption
    if (compileOptions & SH_TRANSLATE_VIEWID_OVR_TO_UNIFORM)
    {
-        TName uniformName(TString("ViewId_OVR"));
+        TName uniformName(TString("ViewID_OVR"));
        uniformName.setInternal(true);
        sink << "highp uniform int " << outputESSL.hashName(uniformName) << ";\n";
    }

--- a/src/compiler/translator/TranslatorGLSL.cpp
+++ b/src/compiler/translator/TranslatorGLSL.cpp
@@ -207,7 +207,7 @@ void TranslatorGLSL::translate(TIntermNode *root, ShCompileOptions compileOption
    if (compileOptions & SH_TRANSLATE_VIEWID_OVR_TO_UNIFORM)
    {
-        TName uniformName(TString("ViewId_OVR"));
+        TName uniformName(TString("ViewID_OVR"));
        uniformName.setInternal(true);
        sink << "uniform int " << outputGLSL.hashName(uniformName) << ";\n";
    }

--- a/src/tests/compiler_tests/WEBGL_multiview_test.cpp
+++ b/src/tests/compiler_tests/WEBGL_multiview_test.cpp
@@ -360,3 +360,24 @@ TEST_F(WEBGLMultiviewVertexShaderTest, RestrictionsLiftedMultiview2)
        FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
    }
 }
+// Correct use of GL_OVR_multiview macros.
+TEST_F(WEBGLMultiviewVertexShaderTest, ValidUseOfExtensionMacros)
+{
+    const std::string &shaderString =
+        "#version 300 es\n"
+        "#ifdef GL_OVR_multiview\n"
+        "#ifdef GL_OVR_multiview2\n"
+        "#if (GL_OVR_multiview == 1) && (GL_OVR_multiview2 == 1)\n"
+        "void main()\n"
+        "{\n"
+        "    gl_Position = vec4(0.0, 0.0, 0.0, 1.0);\n"
+        "}\n"
+        "#endif\n"
+        "#endif\n"
+        "#endif\n";
+    if (!compile(shaderString))
+    {
+        FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
+    }
+}