SPV tests: Turn on some more tests related to currently pending issues.

Test/baseResults/spv.matrix.frag.out

 spv.matrix.frag
-WARNING: 0:6: varying deprecated in version 130; may be removed in future release
-WARNING: 0:17: varying deprecated in version 130; may be removed in future release
-WARNING: 0:22: varying deprecated in version 130; may be removed in future release
-
 
 Linked fragment stage:
 

Test/spv.Operations.frag

-#version 130
+#version 450
 
 uniform ivec4 uiv4;
 uniform vec4 uv4;
@@ -7,10 +7,10 @@ uniform bvec4 ub41, ub42;
 uniform float uf;
 uniform int ui;
 
-#ifdef TEST_POST_110
 uniform uvec4 uuv4;
-uniform unsigned int uui;
-#endif
+uniform uint uui;
+
+out vec4 FragColor;
 
 void main()
 {
@@ -19,9 +19,7 @@ void main()
 	bool b;
 	bvec4 bv4;
 	int i;
-#ifdef TEST_POST_110
 	uint u;
-#endif
 
 	// floating point
     v = radians(uv4);
@@ -51,37 +49,29 @@ void main()
     v += sign(v);
     v += floor(v);
 
-#ifdef TEST_POST_110
     v += trunc(v);
     v += round(v);
     v += roundEven(v);
-#endif
 
     v += ceil(v);
     v += fract(v);
     v += mod(v, v);
 	v += mod(v, v.x);
 
-#ifdef TEST_POST_110
     v += modf(v, v);
-#endif
 
     v += min(v, uv4);
     v += max(v, uv4);
     v += clamp(v, uv4, uv4);
     v += mix(v,v,v);
 
-#ifdef TEST_POST_110
-    v += mix(v,v,ub);
-    v += intBitsToFloat(v);
-    v += uintBitsToFloat(v);
-    v += fma(v);
-    v += frexp(v);
-    v += ldexp(v);
-    v += unpackUnorm2x16(v);
-    v += unpackUnorm4x8(v);
-    v += unpackSnorm4x8(v);
-#endif
+    v += mix(v,v,ub41);
+    v += mix(v,v,f);
+//spv    v += intBitsToFloat(ui);
+//    v += uintBitsToFloat(uui);
+//    i += floatBitsToInt(f);
+//    u += floatBitsToUint(f);
+    v += fma(v, uv4, v);
 
     v += step(v,v);
     v += smoothstep(v,v,v);
@@ -94,9 +84,7 @@ void main()
     v += dFdx(v);
     v += dFdy(v);
     v += fwidth(v);
-	//noise*(v);
 
-#ifdef TEST_POST_110
 	// signed integer
 	i += abs(ui);
 	i += sign(i);
@@ -104,29 +92,14 @@ void main()
 	i += max(i, ui);
 	i += clamp(i, ui, ui);
 
-	floatsBitsToInt(v);
-	packUnorm2x16(v);
-	packUnorm4x8(v);
-	packSnorm4x8(v);
-
 	// unsigned integer
-    u = abs(uui);
-    u += sign(u);
     u += min(u, uui);
     u += max(u, uui);
     u += clamp(u, uui, uui);
-    u += floatsBitToInt(v);
-    u += packUnorm2x16(v);
-    u += packUnorm4x8(v);
-    u += packSnorm4x8(v);
-    u += floatBitsToUInt(v);
-#endif
-
-	// bool
-#ifdef TEST_POST_110
+
+	//// bool
 	b = isnan(uf);
-    b = isinf(v);
-#endif
+    b = isinf(f);
 	b = any(lessThan(v, uv4));
 	b = (b && any(lessThanEqual(v, uv4)));
     b = (b && any(greaterThan(v, uv4)));
@@ -162,5 +135,5 @@ void main()
     i = ~i;
     b = !b;
 
-    gl_FragColor = b ? vec4(i) + vec4(f) + v : v;
+    FragColor = b ? vec4(i) + vec4(f) + v : v;
 }

Test/spv.length.frag

@@ -2,11 +2,7 @@
 
 uniform vec4 u[3];
 
-#ifdef TEST_POST_110
-varying vec2 v[];
-#else
 varying vec2 v[2];
-#endif
 
 void main()
 {

Test/spv.matrix.frag

 #version 130
 
-//#define TEST_POST_110
-
 uniform mat3 colorTransform;
-varying vec3 Color;
+in vec3 Color;
 uniform mat4 m, n;
 
-#ifdef TEST_POST_110
 uniform mat4x3 um43;
 uniform mat3x4 un34;
-#else
-uniform mat4 um43;
-uniform mat4 un34;
-#endif
 
-varying vec4 v;
+in vec4 v;
 
-#ifdef TEST_POST_110
-varying vec3 u;
-#else
-varying vec4 u;
-#endif
+in vec3 u;
 
 void main()
 {
@@ -29,24 +18,14 @@ void main()
 
     if (m != n)
         gl_FragColor += v;
-   else {
+    else {
         gl_FragColor += m * v;
         gl_FragColor += v * (m - n);
-   }
-    
-#ifdef TEST_POST_110
+    }
+
     mat3x4 m34 = outerProduct(v, u);
-    m34 += mat4(v.x);
-    m34 += mat4(u, u.x, u, u.x, u, u.x, u.x);
-#else
-    mat4 m34 = mat4(v.x*u.x, v.x*u.y, v.x*u.z, v.x*u.w, 
-                    v.y*u.x, v.y*u.y, v.y*u.z, v.y*u.w, 
-                    v.z*u.x, v.z*u.y, v.z*u.z, v.z*u.w, 
-                    v.w*u.x, v.w*u.y, v.w*u.z, v.w*u.w);
-    m34 += mat4(v.x);
-    m34 += mat4(u, u.x, u, u.x, u, u.x, u.x);
-
-#endif
+    m34 += mat3x4(v.x);
+    m34 += mat3x4(u, u.x, u, u.x, u, u.x);
 
     if (m34 == un34)
         gl_FragColor += m34 * u;

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 "SPIRV99.836"
-#define GLSLANG_DATE "09-Dec-2015"
+#define GLSLANG_REVISION "SPIRV99.839"
+#define GLSLANG_DATE "11-Dec-2015"