commit 97577623f516dfc008d868808770b06972b00bb0
author Martin Radev <mradev@nvidia.com> Mon Aug 28 11:31:06 2017 +0300
committer Commit Bot <commit-bot@chromium.org> Mon Aug 28 09:38:36 2017 +0000
tree e3d8dd2a4cacf569e9457845cbebd17964f98fdc
parent 18b75bad852c717a302d521d3923b43a17e349ed

Fix assertion failure in CollectVariables.cpp

The built-in gl_Layer can occur in the AST in cases in which either
GL_OVR_multiview or GL_OVR_multiview2 is enabled.

BUG=angleproject:2062
TEST=angle_end2end_tests

Change-Id: I7409b2712c715c3898c33300b7e5689e347742f0
Reviewed-on: https://chromium-review.googlesource.com/636367
Reviewed-by: Olli Etuaho <oetuaho@nvidia.com>
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

src/compiler/translator/CollectVariables.cpp

diff --git a/src/compiler/translator/CollectVariables.cpp b/src/compiler/translator/CollectVariables.cpp
index 8753d77..0486048 100644
--- a/src/compiler/translator/CollectVariables.cpp
+++ b/src/compiler/translator/CollectVariables.cpp
@@ -520,7 +520,8 @@
                 else
                 {
                     ASSERT(mShaderType == GL_VERTEX_SHADER &&
-                           IsExtensionEnabled(mExtensionBehavior, "GL_OVR_multiview"));
+                           (IsExtensionEnabled(mExtensionBehavior, "GL_OVR_multiview") ||
+                            IsExtensionEnabled(mExtensionBehavior, "GL_OVR_multiview2")));
                 }
                 break;
             default: