Vulkan: EXT_gpu_shader5 support: dynamically uniform indexing

src/compiler/translator/CollectVariables.cpp

@@ -952,11 +952,11 @@ bool CollectVariablesTraverser::visitBinary(Visit, TIntermBinary *binaryNode)
             {
                 namedBlock = recordGLInUsed(interfaceType);
                 ASSERT(namedBlock);
-
-                // We need to continue traversing to collect useful variables in the index
-                // expression of gl_in.
-                traverseIndexExpression = true;
             }
+
+            // We need to continue traversing to collect useful variables in the index expression
+            // of the interface block array or gl_in in the case of the if above.
+            traverseIndexExpression = true;
         }
 
         const TInterfaceBlock *interfaceBlock = blockNode->getType().getInterfaceBlock();

src/compiler/translator/ParseContext.cpp

@@ -3994,6 +3994,11 @@ TIntermTyped *TParseContext::addIndexExpression(TIntermTyped *baseExpression,
 
     TIntermConstantUnion *indexConstantUnion = indexExpression->getAsConstantUnion();
 
+    // ES3.2 or ES3.1's EXT_gpu_shader5 allow dynamically uniform expressions to be used as indices
+    // of opaque types (samplers and atomic counters) as well as UBOs, but not SSBOs and images.
+    bool allowUniformIndices =
+        mShaderVersion >= 320 || isExtensionEnabled(TExtension::EXT_gpu_shader5);
+
     // ANGLE should be able to fold any constant expressions resulting in an integer - but to be
     // safe we don't treat "EvqConst" that's evaluated according to the spec as being sufficient
     // for constness. Some interpretations of the spec have allowed constant expressions with side
@@ -4008,10 +4013,18 @@ TIntermTyped *TParseContext::addIndexExpression(TIntermTyped *baseExpression,
                 case EvqPerVertexIn:
                     break;
                 case EvqUniform:
+                    if (!allowUniformIndices)
+                    {
+                        error(location,
+                              "array indexes for uniform block arrays must be constant integral "
+                              "expressions",
+                              "[");
+                    }
+                    break;
                 case EvqBuffer:
                     error(location,
-                          "array indexes for uniform block arrays and shader storage block arrays "
-                          "must be constant integral expressions",
+                          "array indexes for shader storage block arrays must be constant integral "
+                          "expressions",
                           "[");
                     break;
                 default:
@@ -4040,13 +4053,15 @@ TIntermTyped *TParseContext::addIndexExpression(TIntermTyped *baseExpression,
                 case 310:
                     elementType = baseExpression->getType();
                     elementType.toArrayElementType();
-                    if (elementType.isSampler())
+                    if (elementType.isSampler() && !allowUniformIndices)
                     {
                         error(location,
                               "array index for samplers must be constant integral expressions",
                               "[");
                     }
                     break;
+                case 320:
+                    break;
                 default:
                     UNREACHABLE();
                     break;

src/tests/deqp_support/deqp_gles31_test_expectations.txt

@@ -701,15 +701,9 @@
 4105 SWIFTSHADER : dEQP-GLES31.functional.stencil_texturing.format.depth24_stencil8_cube = FAIL
 4105 SWIFTSHADER : dEQP-GLES31.functional.stencil_texturing.format.depth32f_stencil8_cube = FAIL
 
-// OpenGL ES 3.2 / 3.2 extensions
+// OpenGL ES 3.2 / 3.1 extensions
 
 // EXT_gpu_shader5: Note: this extension is not yet fully implemented, so should be disabled in the
 // Vulkan backend for the ES 3.1 conformance run.
-3569 VULKAN : dEQP-GLES31.functional.shaders.opaque_type_indexing.sampler.*uniform.*vertex* = FAIL
-3569 VULKAN : dEQP-GLES31.functional.shaders.opaque_type_indexing.sampler.*uniform.*fragment* = FAIL
-3569 VULKAN : dEQP-GLES31.functional.shaders.opaque_type_indexing.sampler.*uniform.*compute* = FAIL
-3569 VULKAN : dEQP-GLES31.functional.shaders.opaque_type_indexing.ubo.*uniform_vertex = FAIL
-3569 VULKAN : dEQP-GLES31.functional.shaders.opaque_type_indexing.ubo.*uniform_fragment = FAIL
-3569 VULKAN : dEQP-GLES31.functional.shaders.opaque_type_indexing.ubo.*uniform_compute = FAIL
 3569 VULKAN : dEQP-GLES31.functional.texture.gather.offset_dynamic.* = FAIL
 3569 VULKAN : dEQP-GLES31.functional.texture.gather.offsets.* = FAIL

src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt

@@ -146,8 +146,4 @@
 
 4108 SWIFTSHADER : KHR-GLES31.core.shader_image_size.*-nonMS-* = SKIP
 
-// OpenGL ES 3.2 / 3.2 extensions
-
-// EXT_gpu_shader5: Note: this extension is not yet fully implemented, so should be disabled in the
-// Vulkan backend for the ES 3.1 conformance run.
-3569 VULKAN : KHR-GLES31.core.arrays_of_arrays.ExpressionsDynamicIndexing2 = FAIL
+// OpenGL ES 3.2 / 3.1 extensions