HLSL: Declare gl_ViewID_OVR as fragment input if extension is enabled

Previously a pixel shader would have gl_ViewID_OVR as input only if it were used in it. However, in a case with a user-specified varying and no usage of gl_ViewID_OVR in the pixel shader, a link-time error would occur whenever the geometry and pixel shaders were to be linked as the order of parameters in the signatures would not match. The patch addresses this by always having gl_ViewID_OVR declared as pixel shader input if the OVR_multiview(2) shader extension is enabled. The patch does not provide any tests because draw commands are not yet supported at this stage. BUG=angleproject:2062 TEST=angle_end2end_tests Change-Id: Ia154fd53cbf3847cfaf0504e4ec44632b9cd5327 Reviewed-on: https://chromium-review.googlesource.com/641151 Commit-Queue: Martin Radev <mradev@nvidia.com> Reviewed-by: Olli Etuaho <oetuaho@nvidia.com> Reviewed-by: Geoff Lang <geofflang@chromium.org>

HLSL: Declare gl_ViewID_OVR as fragment input if extension is enabled
1ba9b85a · Martin Radev · Commit Bot · 77d4d4da · 1ba9b85a
Commit 1ba9b85a authored Aug 29, 2017 by Martin Radev Committed by Commit Bot Aug 30, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

DynamicHLSL.cpp src/libANGLE/renderer/d3d/DynamicHLSL.cpp +3 -2

No files found.
--- a/src/libANGLE/renderer/d3d/DynamicHLSL.cpp
+++ b/src/libANGLE/renderer/d3d/DynamicHLSL.cpp
@@ -664,8 +664,9 @@ void DynamicHLSL::generateShaderLinkHLSL(const gl::Context *context,
                    << "{\n";
    }
-    if (pixelBuiltins.glViewIDOVR.enabled)
+    if (fragmentShader->usesViewID())
    {
+        ASSERT(pixelBuiltins.glViewIDOVR.enabled);
        pixelStream << "    _ViewID_OVR = input.gl_ViewID_OVR;\n";
    }
@@ -1310,7 +1311,7 @@ void BuiltinVaryingsD3D::updateBuiltins(ShaderType shaderType,
        builtins->glViewIDOVR.enable(userSemantic, reservedSemanticIndex++);
    }
-    if (shaderType == SHADER_PIXEL && metadata.usesViewID())
+    if (shaderType == SHADER_PIXEL && metadata.hasANGLEMultiviewEnabled())
    {
        builtins->glViewIDOVR.enableSystem("SV_ViewportArrayIndex");
    }