commit c39a19aa931e39f298babe866efe33a58052d2f2
author Martin Radev <mradev@nvidia.com> Fri Jul 07 18:52:09 2017 +0300
committer Martin Radev <mradev@nvidia.com> Tue Jul 11 18:32:28 2017 +0300
tree 144792614872090fb0fbca529b68e9fcf2a64641
parent 56229f1bbe2411571a4505e42fd8e58eb60a5552

Select viewport index in the GLSL/ESSL vertex shader

The patch enables viewport selection for multiview rendering in the
GLSL/ESSL vertex shader through the use of the GL_NV_viewport_array2
extension. The AST is modified only for GLSL and ESSL to include the
viewport selection expression after ViewID_OVR's initialization.

BUG=angleproject:2062
TEST=angle_unittests

Change-Id: Iee05bb5a4b687ed53ddbdd466f1572227b1f0cde

src/compiler/translator/Compiler.cpp

diff --git a/src/compiler/translator/Compiler.cpp b/src/compiler/translator/Compiler.cpp
index 6e76fe1..a194071 100644
--- a/src/compiler/translator/Compiler.cpp
+++ b/src/compiler/translator/Compiler.cpp
@@ -431,7 +431,8 @@
         if (success && (compileOptions & SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW) &&
             parseContext.isMultiviewExtensionEnabled() && getShaderType() != GL_COMPUTE_SHADER)
         {
-            DeclareAndInitBuiltinsForInstancedMultiview(root, getNumViews(), getShaderType());
+            DeclareAndInitBuiltinsForInstancedMultiview(root, mNumViews, shaderType, compileOptions,
+                                                        outputType);
         }
 
         // This pass might emit short circuits so keep it before the short circuit unfolding