commit 0d959258fc96c8e9c83fca46f62c112f150654f0
author Corentin Wallez <cwallez@chromium.org> Tue Jul 12 17:26:32 2016 -0400
committer Commit Bot <commit-bot@chromium.org> Mon Jul 18 14:22:01 2016 +0000
tree 06d27d965ed287abca6661bef99a3b40b8eeb75a
parent 1b2f16292e1c5fafef95972f487cfb1d0165ad8e

ParseContext: validate additional restriction for the ? and , operators

WebGL2 shaders have added restriction to improve portability for some
OpenGL compilers that do not support arbitrary ternary and sequence
operators. It disallows these operators for arrays, structs containing
arrays and the void type.

BUG=612066

Change-Id: Id11042051bce25a91e57deaa9591d4d813fed7aa
Reviewed-on: https://chromium-review.googlesource.com/359949
Reviewed-by: Olli Etuaho <oetuaho@nvidia.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

src/compiler/translator/ParseContext.cpp

diff --git a/src/compiler/translator/ParseContext.cpp b/src/compiler/translator/ParseContext.cpp
index 34c8aa2..ad5aa13 100644
--- a/src/compiler/translator/ParseContext.cpp
+++ b/src/compiler/translator/ParseContext.cpp
@@ -3828,6 +3828,19 @@
                                       TIntermTyped *right,
                                       const TSourceLoc &loc)
 {
+    // WebGL2 section 5.26, the following results in an error:
+    // "Sequence operator applied to void, arrays, or structs containing arrays"
+    if (mShaderSpec == SH_WEBGL2_SPEC && (left->isArray() || left->getBasicType() == EbtVoid ||
+                                          left->getType().isStructureContainingArrays() ||
+                                          right->isArray() || right->getBasicType() == EbtVoid ||
+                                          right->getType().isStructureContainingArrays()))
+    {
+        error(loc,
+              "sequence operator is not allowed for void, arrays, or structs containing arrays",
+              ",");
+        recover();
+    }
+
     return intermediate.addComma(left, right, loc, mShaderVersion);
 }
 
@@ -4151,6 +4164,15 @@
         recover();
         return falseBlock;
     }
+    // WebGL2 section 5.26, the following results in an error:
+    // "Ternary operator applied to void, arrays, or structs containing arrays"
+    if (mShaderSpec == SH_WEBGL2_SPEC && trueBlock->getBasicType() == EbtVoid)
+    {
+        error(loc, "ternary operator is not allowed for void", ":");
+        recover();
+        return falseBlock;
+    }
+
     return intermediate.addSelection(cond, trueBlock, falseBlock, loc);
 }