Vulkan: Handle compilation error involving gl_InvocationID

src/compiler/translator/ParseContext.cpp

@@ -1986,6 +1986,21 @@ void TParseContext::checkNoncoherentIsNotSpecified(const TSourceLoc &location, b
     }
 }
 
+void TParseContext::checkTCSOutVarIndexIsValid(TIntermBinary *binaryExpression,
+                                               const TSourceLoc &location)
+{
+    ASSERT(binaryExpression->getOp() == EOpIndexIndirect ||
+           binaryExpression->getOp() == EOpIndexDirect);
+    const TIntermSymbol *intermSymbol = binaryExpression->getRight()->getAsSymbolNode();
+    if ((intermSymbol == nullptr) || (intermSymbol->getName() != "gl_InvocationID"))
+    {
+        error(location,
+              "tessellation-control per-vertex output l-value must be indexed with "
+              "gl_InvocationID",
+              "[");
+    }
+}
+
 void TParseContext::functionCallRValueLValueErrorCheck(const TFunction *fnCandidate,
                                                        TIntermAggregate *fnCall)
 {
@@ -4601,20 +4616,6 @@ TIntermTyped *TParseContext::addIndexExpression(TIntermTyped *baseExpression,
         }
     }
 
-    if (mShaderType == GL_TESS_CONTROL_SHADER &&
-        IsTessellationControlShaderOutput(mShaderType, baseExpression->getQualifier()))
-    {
-        const TIntermSymbol *intermSymbol = indexExpression->getAsSymbolNode();
-        if (!intermSymbol || intermSymbol->getName() != "gl_InvocationID")
-        {
-            error(location,
-                  "tessellation-control per-vertex output l-value must be indexed with "
-                  "gl_InvocationID",
-                  "[");
-            return CreateZeroNode(TType(EbtFloat, EbpHigh, EvqConst));
-        }
-    }
-
     TIntermConstantUnion *indexConstantUnion = indexExpression->getAsConstantUnion();
 
     // ES3.2 or ES3.1's EXT_gpu_shader5 allow dynamically uniform expressions to be used as indices
@@ -6259,6 +6260,14 @@ TIntermTyped *TParseContext::addAssign(TOperator op,
     TIntermBinary *node = nullptr;
     if (binaryOpCommonCheck(op, left, right, loc))
     {
+        TIntermBinary *lValue = left->getAsBinaryNode();
+        if ((lValue != nullptr) &&
+            (lValue->getOp() == EOpIndexIndirect || lValue->getOp() == EOpIndexDirect) &&
+            IsTessellationControlShaderOutput(mShaderType, lValue->getLeft()->getQualifier()))
+        {
+            checkTCSOutVarIndexIsValid(lValue, loc);
+        }
+
         if (op == EOpMulAssign)
         {
             op = TIntermBinary::GetMulAssignOpBasedOnOperands(left->getType(), right->getType());

src/compiler/translator/ParseContext.h

@@ -191,6 +191,7 @@ class TParseContext : angle::NonCopyable
                                         const TPublicType &type,
                                         const TSourceLoc &qualifierLocation);
     void checkLocalVariableConstStorageQualifier(const TQualifierWrapperBase &qualifier);
+    void checkTCSOutVarIndexIsValid(TIntermBinary *binaryExpression, const TSourceLoc &location);
     const TPragma &pragma() const { return mDirectiveHandler.pragma(); }
     const TExtensionBehavior &extensionBehavior() const
     {

src/tests/deqp_support/deqp_gles31_test_expectations.txt

@@ -186,7 +186,6 @@
 5452 VULKAN : dEQP-GLES31.functional.geometry_shading.layered.layer_provoking_vertex_* = FAIL
 
 // Tessellation shader support:
-5557 VULKAN : dEQP-GLES31.functional.tessellation.shader_input_output.barrier = FAIL
 5557 VULKAN : dEQP-GLES31.functional.tessellation.shader_input_output.gl_position_tcs_to_tes = FAIL
 
 ////