nonuniform: expand test for all types that can be arrayed.

Test/spv.nonuniform.frag

@@ -5,7 +5,17 @@
 layout(location=0) nonuniformEXT in vec4 nu_inv4;
 nonuniformEXT float nu_gf;
 layout(location=1) in nonuniformEXT flat int nu_ii;
-layout(binding=0) uniform sampler2D s2d[];
+
+layout(binding=0, input_attachment_index = 0) uniform subpassInput        inputAttachmentDyn[];
+layout(binding=1)                             uniform samplerBuffer       uniformTexelBufferDyn[];
+layout(binding=2, r32f)                       uniform imageBuffer         storageTexelBufferDyn[];
+layout(binding=3)                             uniform uname { float a; }  uniformBuffer[];
+layout(binding=4)                             buffer bname { float b; }   storageBuffer[];
+layout(binding=5)                             uniform sampler2D           sampledImage[];
+layout(binding=6, r32f)                       uniform image2D             storageImage[];
+layout(binding=7, input_attachment_index = 1) uniform subpassInput        inputAttachment[];
+layout(binding=8)                             uniform samplerBuffer       uniformTexelBuffer[];
+layout(binding=9, r32f)                       uniform imageBuffer         storageTexelBuffer[];
 
 nonuniformEXT int foo(nonuniformEXT int nupi, nonuniformEXT out int f)
 {
@@ -15,11 +25,21 @@ nonuniformEXT int foo(nonuniformEXT int nupi, nonuniformEXT out int f)
 void main()
 {
     nonuniformEXT int nu_li;
+    int dyn_i;
 
     int a = foo(nu_li, nu_li);
     nu_li = nonuniformEXT(a) + nonuniformEXT(a * 2);
 
     float b;
     b = nu_inv4.x * nu_gf;
-    texture(s2d[nu_ii], vec2(0.5));
+    b += subpassLoad(inputAttachmentDyn[dyn_i]).x;
+    b += texelFetch(uniformTexelBufferDyn[dyn_i], 1).x;
+    b += imageLoad(storageTexelBufferDyn[dyn_i], 1).x;
+    b += uniformBuffer[nu_ii].a;
+    b += storageBuffer[nu_ii].b;
+    b + texture(sampledImage[nu_ii], vec2(0.5)).x;
+    b += imageLoad(storageImage[nu_ii], ivec2(1)).x;
+    b += subpassLoad(inputAttachment[nu_ii]).x;
+    b += texelFetch(uniformTexelBuffer[nu_ii], 1).x;
+    b += imageLoad(storageTexelBuffer[nu_ii], 1).x;
 }

glslang/MachineIndependent/ParseHelper.cpp

@@ -4679,6 +4679,9 @@ void TParseContext::layoutTypeCheck(const TSourceLoc& loc, const TType& type)
         if (type.getBasicType() == EbtSampler) {
             int lastBinding = qualifier.layoutBinding;
             if (type.isArray()) {
+                if (spvVersion.vulkan > 0)
+                    lastBinding += 1;
+                else {
                     if (type.isSizedArray())
                         lastBinding += type.getCumulativeArraySize();
                     else {
@@ -4686,6 +4689,7 @@ void TParseContext::layoutTypeCheck(const TSourceLoc& loc, const TType& type)
                         warn(loc, "assuming array size of one for compile-time checking of binding numbers for unsized array", "[]", "");
                     }
                 }
+            }
             if (spvVersion.vulkan == 0 && lastBinding >= resources.maxCombinedTextureImageUnits)
                 error(loc, "sampler binding not less than gl_MaxCombinedTextureImageUnits", "binding", type.isArray() ? "(using array)" : "");
         }