diff --git a/Test/310.vert b/Test/310.vert index 1782938e..58ed7480 100644 --- a/Test/310.vert +++ b/Test/310.vert @@ -3,7 +3,7 @@ shared vec4 s; // ERROR layout(local_size_x = 2) out; // ERROR buffer vec4 v; // ERROR - +in int ini; layout(location = 2) uniform mat4 x; layout(location = 3) uniform mat4 y; layout(location = 2) out mat4 xi; @@ -65,8 +65,8 @@ void foo() vec4 v4 = texelFetch(s2dms, v2, 2); ivec4 iv4 = texelFetch(is2dms, v2, 2); textureSamples(s2dms); // ERROR - - + float f; + frexp(f, ini); // ERROR, i not writable } out bool outb; // ERROR diff --git a/Test/baseResults/310.vert.out b/Test/baseResults/310.vert.out index 95770ced..6d02e4c9 100644 --- a/Test/baseResults/310.vert.out +++ b/Test/baseResults/310.vert.out @@ -7,6 +7,8 @@ ERROR: 0:10: 'location' : overlapping use of location 3 ERROR: 0:58: 'usampler2DMSArray' : Reserved word. ERROR: 0:58: 'sampler/image' : type requires declaration of default precision qualifier ERROR: 0:67: 'textureSamples' : no matching overloaded function found +ERROR: 0:69: 'assign' : l-value required "ini" (can't modify shader input) +ERROR: 0:69: 'out' : Non-L-value cannot be passed for 'out' or 'inout' parameters. ERROR: 0:72: 'out' : cannot be bool ERROR: 0:73: 'sampler2D' : sampler/image types can only be used in uniform variables or function parameters: outo ERROR: 0:75: 'vertex-shader array-of-array output' : not supported with this profile: es @@ -94,7 +96,7 @@ ERROR: 0:389: 'sample' : Reserved word. ERROR: 0:400: 'interpolateAtCentroid' : no matching overloaded function found ERROR: 0:401: 'interpolateAtSample' : no matching overloaded function found ERROR: 0:402: 'interpolateAtOffset' : no matching overloaded function found -ERROR: 90 compilation errors. No code generated. +ERROR: 92 compilation errors. No code generated. Shader version: 310 @@ -253,6 +255,9 @@ ERROR: node is still EOpNull! 0:66 2 (const int) 0:67 Constant: 0:67 0.000000 +0:69 frexp (global highp float) +0:69 'f' (temp highp float) +0:69 'ini' (in highp int) 0:114 Function Definition: foo_IO( (global void) 0:114 Function Parameters: 0:116 Sequence @@ -911,6 +916,7 @@ ERROR: node is still EOpNull! 0:? Linker Objects 0:? 's' (shared highp 4-component vector of float) 0:? 'v' (buffer highp 4-component vector of float) +0:? 'ini' (in highp int) 0:? 'x' (layout(location=2 ) uniform highp 4X4 matrix of float) 0:? 'y' (layout(location=3 ) uniform highp 4X4 matrix of float) 0:? 'xi' (layout(location=2 ) smooth out highp 4X4 matrix of float) @@ -1180,6 +1186,9 @@ ERROR: node is still EOpNull! 0:66 2 (const int) 0:67 Constant: 0:67 0.000000 +0:69 frexp (global highp float) +0:69 'f' (temp highp float) +0:69 'ini' (in highp int) 0:114 Function Definition: foo_IO( (global void) 0:114 Function Parameters: 0:116 Sequence @@ -1838,6 +1847,7 @@ ERROR: node is still EOpNull! 0:? Linker Objects 0:? 's' (shared highp 4-component vector of float) 0:? 'v' (buffer highp 4-component vector of float) +0:? 'ini' (in highp int) 0:? 'x' (layout(location=2 ) uniform highp 4X4 matrix of float) 0:? 'y' (layout(location=3 ) uniform highp 4X4 matrix of float) 0:? 'xi' (layout(location=2 ) smooth out highp 4X4 matrix of float) diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index e74c41ab..63190803 100644 --- a/glslang/Include/revision.h +++ b/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.778" -#define GLSLANG_DATE "02-Oct-2015" +#define GLSLANG_REVISION "3.0.779" +#define GLSLANG_DATE "05-Oct-2015"