diff --git a/Test/baseResults/330.frag.out b/Test/baseResults/330.frag.out index c3bb92c5..3e17d923 100644 --- a/Test/baseResults/330.frag.out +++ b/Test/baseResults/330.frag.out @@ -97,7 +97,7 @@ ERROR: node is still EOpNull! 0:? 'in4' (in block{layout(location=50 ) in float f1, layout(location=51 ) in float f2}) 0:? 's' (layout(location=33 ) smooth in structure{global 3-component vector of float a, global 2X2 matrix of float b, global 2-element array of 4-component vector of float c, temp 2-component vector of float A}) 0:? 'anon@2' (in block{layout(location=44 component=0 ) in 4-component vector of float d, layout(location=45 component=0 ) in 4-component vector of float e, layout(location=47 ) in 4-component vector of float f, layout(location=48 component=0 ) in 4-component vector of float g, layout(location=41 ) in 4-component vector of float h, layout(location=42 component=0 ) in 4-component vector of float i, layout(location=43 component=0 ) in 4-component vector of float j, layout(location=44 component=0 ) in 4-component vector of float k}) -0:? 'outVar2' (layout(location=63 index=0 ) out 4-component vector of float) +0:? 'outVar2' (layout(location=4095 index=0 ) out 4-component vector of float) 0:? 'outVar3' (layout(location=0 index=1 ) out 4-component vector of float) 0:? 'outVar4' (layout(location=0 index=1 ) out 4-component vector of float) 0:? 'indexIn' (layout(location=27 index=0 ) smooth in 4-component vector of float) @@ -170,7 +170,7 @@ ERROR: node is still EOpNull! 0:? 'in4' (in block{layout(location=50 ) in float f1, layout(location=51 ) in float f2}) 0:? 's' (layout(location=33 ) smooth in structure{global 3-component vector of float a, global 2X2 matrix of float b, global 2-element array of 4-component vector of float c, temp 2-component vector of float A}) 0:? 'anon@2' (in block{layout(location=44 component=0 ) in 4-component vector of float d, layout(location=45 component=0 ) in 4-component vector of float e, layout(location=47 ) in 4-component vector of float f, layout(location=48 component=0 ) in 4-component vector of float g, layout(location=41 ) in 4-component vector of float h, layout(location=42 component=0 ) in 4-component vector of float i, layout(location=43 component=0 ) in 4-component vector of float j, layout(location=44 component=0 ) in 4-component vector of float k}) -0:? 'outVar2' (layout(location=63 index=0 ) out 4-component vector of float) +0:? 'outVar2' (layout(location=4095 index=0 ) out 4-component vector of float) 0:? 'outVar3' (layout(location=0 index=1 ) out 4-component vector of float) 0:? 'outVar4' (layout(location=0 index=1 ) out 4-component vector of float) 0:? 'indexIn' (layout(location=27 index=0 ) smooth in 4-component vector of float) diff --git a/Test/baseResults/440.vert.out b/Test/baseResults/440.vert.out index b4d85b1b..0dfecada 100644 --- a/Test/baseResults/440.vert.out +++ b/Test/baseResults/440.vert.out @@ -76,7 +76,7 @@ ERROR: node is still EOpNull! 0:? 'ba' (layout(location=32 component=1 ) smooth out 4X4 matrix of float) 0:? 'Ss' (layout(location=33 component=1 ) smooth out structure{global int a}) 0:? 'bb' (layout(location=34 component=1 ) out block{out int a}) -0:? 'bc' (layout(location=63 component=1 ) smooth out float) +0:? 'bc' (layout(location=4095 component=1 ) smooth out float) 0:? 'bd' (out block{layout(location=40 component=2 ) out float u, layout(location=40 component=0 ) out float v, layout(location=40 component=3 ) out float w, layout(location=40 component=1 ) out 2-component vector of float x, layout(location=41 component=3 ) out 2-component vector of float y, layout(location=42 component=1 ) out 4-component vector of float z, layout(location=42 component=1 ) out 4X4 matrix of float ba, layout(location=43 component=1 ) out structure{global int a} Ss}) 0:? 'be' (layout(location=50 component=3 ) smooth out int) 0:? 'bf' (layout(location=50 component=0 ) smooth out 3-component vector of float) @@ -144,7 +144,7 @@ ERROR: node is still EOpNull! 0:? 'ba' (layout(location=32 component=1 ) smooth out 4X4 matrix of float) 0:? 'Ss' (layout(location=33 component=1 ) smooth out structure{global int a}) 0:? 'bb' (layout(location=34 component=1 ) out block{out int a}) -0:? 'bc' (layout(location=63 component=1 ) smooth out float) +0:? 'bc' (layout(location=4095 component=1 ) smooth out float) 0:? 'bd' (out block{layout(location=40 component=2 ) out float u, layout(location=40 component=0 ) out float v, layout(location=40 component=3 ) out float w, layout(location=40 component=1 ) out 2-component vector of float x, layout(location=41 component=3 ) out 2-component vector of float y, layout(location=42 component=1 ) out 4-component vector of float z, layout(location=42 component=1 ) out 4X4 matrix of float ba, layout(location=43 component=1 ) out structure{global int a} Ss}) 0:? 'be' (layout(location=50 component=3 ) smooth out int) 0:? 'bf' (layout(location=50 component=0 ) smooth out 3-component vector of float) diff --git a/glslang/Include/Types.h b/glslang/Include/Types.h index c765d443..cccc87c9 100644 --- a/glslang/Include/Types.h +++ b/glslang/Include/Types.h @@ -513,8 +513,8 @@ public: int layoutOffset; int layoutAlign; - unsigned int layoutLocation : 7; - static const unsigned int layoutLocationEnd = 0x3F; + unsigned int layoutLocation :12; + static const unsigned int layoutLocationEnd = 0xFFF; unsigned int layoutComponent : 3; static const unsigned int layoutComponentEnd = 4; diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index cd2e5473..12a3874b 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.750" +#define GLSLANG_REVISION "3.0.752" #define GLSLANG_DATE "13-Sep-2015"