commit e01c02b69c01975e8d76e64c80241b723f612a39
author Olli Etuaho <oetuaho@nvidia.com> Mon May 08 14:41:49 2017 +0300
committer Commit Bot <commit-bot@chromium.org> Mon May 22 08:32:56 2017 +0000
tree 7afb3d1141b690759e7d22940874b3c537d30320
parent 764a1e767c7643bbfda0ff846010e5ec9f912308

Clean up ternary op validation

Use "?:" as the operator string to make the error message clearer.

Update some comments to refer to specific revisions of the spec, since
there have been some spec changes in this area.

BUG=angleproject:2032

Change-Id: Ic5d128391bfa46187ad335228077f5eab9eac349
Reviewed-on: https://chromium-review.googlesource.com/500270
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

src/compiler/translator/ParseContext.cpp

diff --git a/src/compiler/translator/ParseContext.cpp b/src/compiler/translator/ParseContext.cpp
index 7777f98..4615bf3 100644
--- a/src/compiler/translator/ParseContext.cpp
+++ b/src/compiler/translator/ParseContext.cpp
@@ -4523,32 +4523,35 @@
 
     if (trueExpression->getType() != falseExpression->getType())
     {
-        binaryOpError(loc, ":", trueExpression->getCompleteString(),
+        binaryOpError(loc, "?:", trueExpression->getCompleteString(),
                       falseExpression->getCompleteString());
         return falseExpression;
     }
     if (IsOpaqueType(trueExpression->getBasicType()))
     {
         // ESSL 1.00 section 4.1.7
-        // ESSL 3.00 section 4.1.7
+        // ESSL 3.00.6 section 4.1.7
         // Opaque/sampler types are not allowed in most types of expressions, including ternary.
         // Note that structs containing opaque types don't need to be checked as structs are
         // forbidden below.
-        error(loc, "ternary operator is not allowed for opaque types", ":");
+        error(loc, "ternary operator is not allowed for opaque types", "?:");
         return falseExpression;
     }
 
-    // ESSL1 sections 5.2 and 5.7:
-    // ESSL3 section 5.7:
+    // ESSL 1.00.17 sections 5.2 and 5.7:
     // Ternary operator is not among the operators allowed for structures/arrays.
+    // ESSL 3.00.6 section 5.7:
+    // Ternary operator support is optional for arrays. No certainty that it works across all
+    // devices with struct either, so we err on the side of caution here. TODO (oetuaho@nvidia.com):
+    // Would be nice to make the spec and implementation agree completely here.
     if (trueExpression->isArray() || trueExpression->getBasicType() == EbtStruct)
     {
-        error(loc, "ternary operator is not allowed for structures or arrays", ":");
+        error(loc, "ternary operator is not allowed for structures or arrays", "?:");
         return falseExpression;
     }
     if (trueExpression->getBasicType() == EbtInterfaceBlock)
     {
-        error(loc, "ternary operator is not allowed for interface blocks", ":");
+        error(loc, "ternary operator is not allowed for interface blocks", "?:");
         return falseExpression;
     }
 
@@ -4556,7 +4559,7 @@
     // "Ternary operator applied to void, arrays, or structs containing arrays"
     if (mShaderSpec == SH_WEBGL2_SPEC && trueExpression->getBasicType() == EbtVoid)
     {
-        error(loc, "ternary operator is not allowed for void", ":");
+        error(loc, "ternary operator is not allowed for void", "?:");
         return falseExpression;
     }