Fix decorating ViewID_OVR in HLSL output

samples/shader_translator/shader_translator.cpp

@@ -282,6 +282,17 @@ int main(int argc, char *argv[])
             }
             if (compiler)
             {
+                switch (output)
+                {
+                    case SH_HLSL_3_0_OUTPUT:
+                    case SH_HLSL_4_1_OUTPUT:
+                    case SH_HLSL_4_0_FL9_3_OUTPUT:
+                        compileOptions &= ~SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER;
+                        break;
+                    default:
+                        break;
+                }
+
                 bool compiled = CompileFile(argv[0], compiler, compileOptions);
 
                 LogMsg("BEGIN", "COMPILER", numCompiles, "INFO LOG");

src/compiler/translator/OutputHLSL.cpp

@@ -453,12 +453,11 @@ void OutputHLSL::writeReferencedVaryings(TInfoSinkBase &out) const
     for (const auto &varying : mReferencedVaryings)
     {
         const TType &type           = varying.second->getType();
-        const ImmutableString &name = varying.second->name();
 
         // Program linking depends on this exact format
         out << "static " << InterpolationString(type.getQualifier()) << " " << TypeString(type)
-            << " " << Decorate(name) << ArrayString(type) << " = " << zeroInitializer(type)
-            << ";\n";
+            << " " << DecorateVariableIfNeeded(*varying.second) << ArrayString(type) << " = "
+            << zeroInitializer(type) << ";\n";
     }
 }
 
@@ -958,8 +957,8 @@ void OutputHLSL::visitSymbol(TIntermSymbol *node)
         else if (IsVarying(qualifier))
         {
             mReferencedVaryings[uniqueId.get()] = &variable;
-            out << Decorate(name);
-            if (name == "ViewID_OVR")
+            out << DecorateVariableIfNeeded(variable);
+            if (variable.symbolType() == SymbolType::AngleInternal && name == "ViewID_OVR")
             {
                 mUsesViewID = true;
             }

src/libANGLE/renderer/d3d/DynamicHLSL.cpp

@@ -516,17 +516,17 @@ void DynamicHLSL::generateShaderLinkHLSL(const gl::Context *context,
 
     if (vertexBuiltins.glViewIDOVR.enabled)
     {
-        vertexStream << "    output.gl_ViewID_OVR = _ViewID_OVR;\n";
+        vertexStream << "    output.gl_ViewID_OVR = ViewID_OVR;\n";
     }
     if (programMetadata.hasANGLEMultiviewEnabled() && programMetadata.canSelectViewInVertexShader())
     {
         ASSERT(vertexBuiltins.glViewportIndex.enabled && vertexBuiltins.glLayer.enabled);
         vertexStream << "    if (multiviewSelectViewportIndex)\n"
                      << "    {\n"
-                     << "         output.gl_ViewportIndex = _ViewID_OVR;\n"
+                     << "         output.gl_ViewportIndex = ViewID_OVR;\n"
                      << "    } else {\n"
                      << "         output.gl_ViewportIndex = 0;\n"
-                     << "         output.gl_Layer = _ViewID_OVR;\n"
+                     << "         output.gl_Layer = ViewID_OVR;\n"
                      << "    }\n";
     }
 
@@ -694,7 +694,7 @@ void DynamicHLSL::generateShaderLinkHLSL(const gl::Context *context,
     if (fragmentShader->usesViewID())
     {
         ASSERT(pixelBuiltins.glViewIDOVR.enabled);
-        pixelStream << "    _ViewID_OVR = input.gl_ViewID_OVR;\n";
+        pixelStream << "    ViewID_OVR = input.gl_ViewID_OVR;\n";
     }
 
     if (pixelBuiltins.glFragCoord.enabled)

src/tests/compiler_tests/WEBGL_multiview_test.cpp

@@ -558,6 +558,9 @@ TEST_F(WEBGLMultiviewVertexShaderOutputCodeTest, ViewIDAndInstanceIDHaveCorrectV
     EXPECT_TRUE(foundInAllGLSLCode("InstanceID = int((uint(gl_InstanceID) / 3u))"));
 
     EXPECT_TRUE(foundInHLSLCode("ViewID_OVR = (uint_ctor(gl_InstanceID) % 3)"));
+#if defined(ANGLE_ENABLE_HLSL)
+    EXPECT_FALSE(foundInHLSLCode("_ViewID_OVR = (uint_ctor(gl_InstanceID) % 3)"));
+#endif
     EXPECT_TRUE(foundInHLSLCode("InstanceID = int_ctor((uint_ctor(gl_InstanceID) / 3))"));
 }