Front-end: Fix: Cubemap arrays only use 3-component coord when accessed as an image.

Test/310.vert

@@ -265,6 +265,10 @@ uniform writeonly imageCubeArray  CA1;
 uniform writeonly iimageCubeArray CA2;
 uniform writeonly uimageCubeArray CA3;
 
+layout(rgba16f) uniform readonly imageCubeArray  rCA1;
+layout(rgba32i) uniform readonly iimageCubeArray rCA2;
+layout(r32ui) uniform readonly uimageCubeArray rCA3;
+
 #ifdef GL_OES_texture_cube_map_array
 uniform samplerCubeArray          CA4;
 uniform samplerCubeArrayShadow    CA5;
@@ -304,6 +308,14 @@ void CAT()
     highp ivec3 s1 = imageSize(CA1);
     highp ivec3 s2 = imageSize(CA2);
     highp ivec3 s3 = imageSize(CA3);
+
+    imageStore(CA1, s3, vec4(1));
+    imageStore(CA2, s3, ivec4(1));
+    imageStore(CA3, s3, uvec4(1));
+
+    highp vec4 cl1 = imageLoad(rCA1, s3);
+    highp ivec4 cl2 = imageLoad(rCA2, s3);
+    highp uvec4 cl3 = imageLoad(rCA3, s3);
 }
 
 uniform sampler2DMSArray  bad2DMS;    // ERROR, reserved

Test/spv.image.frag

@@ -51,8 +51,8 @@ void main()
     imageStore(i3D, ic3D, v);
     v += imageLoad(iCube, ic3D);
     imageStore(iCube, ic3D, v);
-    v += imageLoad(iCubeArray, ic4D);
-    imageStore(iCubeArray, ic4D, v);
+    v += imageLoad(iCubeArray, ic3D);
+    imageStore(iCubeArray, ic3D, v);
     v += imageLoad(i2DRect, ic2D);
     imageStore(i2DRect, ic2D, v);
     v += imageLoad(i1DArray, ic2D);

glslang/Include/revision.h

@@ -2,5 +2,5 @@
 // For the version, it uses the latest git tag followed by the number of commits.
 // For the date, it uses the current date (when then script is run).
 
-#define GLSLANG_REVISION "3.0.776"
-#define GLSLANG_DATE "30-Sep-2015"
+#define GLSLANG_REVISION "3.0.777"
+#define GLSLANG_DATE "01-Oct-2015"

glslang/MachineIndependent/Initialize.cpp

@@ -2024,7 +2024,11 @@ void TBuiltIns::addQueryFunctions(TSampler sampler, TString& typeName, int versi
 //
 void TBuiltIns::addImageFunctions(TSampler sampler, TString& typeName, int version, EProfile profile)
 {
-    int dims = dimMap[sampler.dim] + (sampler.arrayed ? 1 : 0);
+    int dims = dimMap[sampler.dim];
+    // most things with an array add a dimension, except for cubemaps
+    if (sampler.arrayed && sampler.dim != EsdCube)
+        ++dims;
+
     TString imageParams = typeName;
     if (dims == 1)
         imageParams.append(", int");