Implement 'index' layout qualifier for fragment outputs. Based partly on a submission.

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@27759 e7fa87d3-cd2b-0410-9028-fcbf551c1848
2014-08-19 02:12:44 +00:00
parent d1888f83f6
commit aa657c117e
18 changed files with 135 additions and 58 deletions
--- a/Test/baseResults/140.frag.out
+++ b/Test/baseResults/140.frag.out
@@ -6,7 +6,6 @@ ERROR: 0:24: 'location' : not supported for this version or the enabled extensio
 ERROR: 0:24: 'location qualifier on input' : not supported for this version or the enabled extensions 
 ERROR: 0:26: 'location' : not supported for this version or the enabled extensions 
 ERROR: 0:26: 'location qualifier on output' : not supported for this version or the enabled extensions 
-WARNING: 0:28: '#extension' : extension is only partially supported: GL_ARB_explicit_attrib_location
 ERROR: 0:38: 'assign' :  l-value required "v" (can't modify shader input)
 ERROR: 0:38: 'out' : Non-L-value cannot be passed for 'out' or 'inout' parameters. 
 ERROR: 8 compilation errors.  No code generated.
--- a/Test/baseResults/140.vert.out
+++ b/Test/baseResults/140.vert.out
@@ -2,7 +2,6 @@
 ERROR: 0:23: 'gl_Position' : identifiers starting with "gl_" are reserved 
 ERROR: 0:25: 'location' : not supported for this version or the enabled extensions 
 ERROR: 0:25: 'location qualifier on input' : not supported for this version or the enabled extensions 
-WARNING: 0:27: '#extension' : extension is only partially supported: GL_ARB_explicit_attrib_location
 ERROR: 0:34: 'redeclaration' : cannot change storage, memory, or auxiliary qualification of gl_Position
 ERROR: 0:34: 'redeclaration' : cannot change interpolation qualification of gl_Position
 ERROR: 0:35: 'redeclaration' : cannot change the type of gl_Position
--- a/Test/baseResults/330.frag.out
+++ b/Test/baseResults/330.frag.out
@@ -26,7 +26,14 @@ ERROR: 0:89: 'location qualifier on uniform or buffer' : not supported for this
 ERROR: 0:94: 'location' : either the block needs a location, or all members need a location, or no members have a location 
 ERROR: 0:108: 'A' : cannot use layout qualifiers on structure members 
 ERROR: 0:119: 'location' : overlapping use of location 44
-ERROR: 27 compilation errors.  No code generated.
+ERROR: 0:122: 'index' : can only be used with an explicit location 
+ERROR: 0:124: 'location' : overlapping use of location 0
+ERROR: 0:125: 'index' : can only be used on an output 
+ERROR: 0:126: 'index' : can only be used on an output 
+ERROR: 0:126: 'location/component/index' : cannot declare a default, use a full declaration 
+ERROR: 0:127: 'location/component/index' : cannot declare a default, use a full declaration 
+ERROR: 0:128: 'out' : cannot declare an output block in a fragment shader 
+ERROR: 34 compilation errors.  No code generated.


 Shader version: 330
@@ -61,11 +68,11 @@ ERROR: node is still EOpNull!
 0:23            Constant:
 0:23              2 (const uint)
 0:24      move second child to first child (4-component vector of float)
-0:24        'outVar' (out 4-component vector of float)
+0:24        'outVar' (layout(location=0 index=0 ) out 4-component vector of float)
 0:24        'inVar' (smooth in 4-component vector of float)
 0:?   Linker Objects
 0:?     'inVar' (smooth in 4-component vector of float)
-0:?     'outVar' (out 4-component vector of float)
+0:?     'outVar' (layout(location=0 index=0 ) out 4-component vector of float)
 0:?     'varyingVar' (smooth in 4-component vector of float)
 0:?     'anon@0' (in block{in 4-component vector of float gl_Color, })
 0:?     'gl_name' (in block{in int gl_i})
@@ -90,6 +97,11 @@ 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{3-component vector of float a, 2X2 matrix of float b, 2-element array of 4-component vector of float c, 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:?     '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)
+0:?     'indexBlockI' (layout(location=26 index=0 ) out block{out int a})


 Linked fragment stage:
@@ -129,11 +141,11 @@ ERROR: node is still EOpNull!
 0:23            Constant:
 0:23              2 (const uint)
 0:24      move second child to first child (4-component vector of float)
-0:24        'outVar' (out 4-component vector of float)
+0:24        'outVar' (layout(location=0 index=0 ) out 4-component vector of float)
 0:24        'inVar' (smooth in 4-component vector of float)
 0:?   Linker Objects
 0:?     'inVar' (smooth in 4-component vector of float)
-0:?     'outVar' (out 4-component vector of float)
+0:?     'outVar' (layout(location=0 index=0 ) out 4-component vector of float)
 0:?     'varyingVar' (smooth in 4-component vector of float)
 0:?     'anon@0' (in block{in 4-component vector of float gl_Color, })
 0:?     'gl_name' (in block{in int gl_i})
@@ -158,4 +170,9 @@ 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{3-component vector of float a, 2X2 matrix of float b, 2-element array of 4-component vector of float c, 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:?     '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)
+0:?     'indexBlockI' (layout(location=26 index=0 ) out block{out int a})

--- a/Test/baseResults/400.geom.out
+++ b/Test/baseResults/400.geom.out
@@ -18,7 +18,8 @@ ERROR: 0:65: 'max_vertices' : can only apply to 'out'
 ERROR: 0:65: 'invocations' : can only apply to 'in' 
 ERROR: 0:67: 'in' : type must be an array: inbls
 ERROR: 0:71: 'triangles' : inconsistent input primitive for array size of inbla
-ERROR: 18 compilation errors.  No code generated.
+ERROR: 0:103: 'index' : there is no such layout identifier for this stage taking an assigned value 
+ERROR: 19 compilation errors.  No code generated.


 Shader version: 400
@@ -180,6 +181,7 @@ ERROR: node is still EOpNull!
 0:?     'scalar' (in float)
 0:?     'inbls' (in block{in int a})
 0:?     'inbla' (in 17-element array of block{in int a})
+0:?     'indexedOut' (layout(location=7 stream=0 ) out 4-component vector of float)


 Linked geometry stage:
@@ -345,4 +347,5 @@ ERROR: node is still EOpNull!
 0:?     'scalar' (in float)
 0:?     'inbls' (in block{in int a})
 0:?     'inbla' (in 17-element array of block{in int a})
+0:?     'indexedOut' (layout(location=7 stream=0 ) out 4-component vector of float)

--- a/Test/baseResults/420.vert.out
+++ b/Test/baseResults/420.vert.out
@@ -23,7 +23,8 @@ ERROR: 0:54: 'y' : vector field selection out of range
 ERROR: 0:62: 'xxxxx' : illegal vector field selection 
 ERROR: 0:63: 'xxy' : vector field selection out of range 
 ERROR: 0:66: 'binding' : cannot declare a default, include a type or full declaration 
-ERROR: 0:69: 'location' : cannot declare a default, use a full declaration 
+ERROR: 0:69: 'location/component/index' : cannot declare a default, use a full declaration 
+ERROR: 0:70: 'in' : cannot declare an input block in a vertex shader 
 ERROR: 0:70: 'binding' : requires uniform or buffer storage qualifier 
 ERROR: 0:71: 'binding' : binding is too large 
 ERROR: 0:74: 'binding' : sampler binding not less than gl_MaxCombinedTextureImageUnits 
@@ -48,7 +49,7 @@ ERROR: 0:142: 'r8_snorm' : does not apply to signed integer images
 ERROR: 0:143: 'rgba32ui' : does not apply to signed integer images 
 ERROR: 0:144: 'r8ui' : does not apply to signed integer images 
 ERROR: 0:147: 'offset on block member' : not supported for this version or the enabled extensions 
-ERROR: 47 compilation errors.  No code generated.
+ERROR: 48 compilation errors.  No code generated.


 Shader version: 420
--- a/Test/baseResults/430.vert.out
+++ b/Test/baseResults/430.vert.out
@@ -1,6 +1,7 @@
 430.vert
 Warning, version 430 is not yet complete; most version-specific features are present, but some are missing.
 ERROR: 0:3: 'location' : can only appy to uniform, buffer, in, or out storage qualifiers 
+ERROR: 0:7: 'in' : cannot declare an input block in a vertex shader 
 ERROR: 0:7: 'location qualifier on in/out block' : not supported for this version or the enabled extensions 
 ERROR: 0:8: 'location qualifier on in/out block' : not supported for this version or the enabled extensions 
 ERROR: 0:21: 'g' : cannot use storage or interpolation qualifiers on structure members 
@@ -16,7 +17,9 @@ ERROR: 0:47: 'gl_ClipDistance array size' : must be less than gl_MaxClipDistance
 ERROR: 0:51: 'start' : undeclared identifier 
 ERROR: 0:51: '' : constant expression required 
 ERROR: 0:51: 'layout-id value' : scalar integer expression required 
+ERROR: 0:53: 'in' : cannot declare an input block in a vertex shader 
 ERROR: 0:54: 'location on block member' : not supported for this version or the enabled extensions 
+ERROR: 0:57: 'in' : cannot declare an input block in a vertex shader 
 ERROR: 0:58: 'location on block member' : not supported for this version or the enabled extensions 
 ERROR: 0:59: 'location on block member' : not supported for this version or the enabled extensions 
 ERROR: 0:62: 'uniform buffer-member align' : not supported for this version or the enabled extensions 
@@ -44,6 +47,8 @@ ERROR: 0:92: 'transform feedback qualifier' : not supported for this version or
 ERROR: 0:93: 'transform feedback qualifier' : not supported for this version or the enabled extensions 
 ERROR: 0:93: 'transform feedback qualifier' : not supported for this version or the enabled extensions 
 ERROR: 0:93: 'transform feedback qualifier' : not supported for this version or the enabled extensions 
+ERROR: 0:117: 'in' : cannot declare an input block in a vertex shader 
+ERROR: 0:123: 'in' : cannot declare an input block in a vertex shader 
 ERROR: 0:146: 'shared' : not supported in this stage: vertex
 ERROR: 0:150: 'barrier' : no matching overloaded function found 
 ERROR: 0:154: 'memoryBarrierShared' : no matching overloaded function found 
@@ -53,7 +58,7 @@ ERROR: 0:168: 'textureSamples and imageSamples' : not supported for this version
 ERROR: 0:169: 'textureSamples and imageSamples' : not supported for this version or the enabled extensions 
 ERROR: 0:170: 'textureSamples and imageSamples' : not supported for this version or the enabled extensions 
 ERROR: 0:171: 'textureSamples and imageSamples' : not supported for this version or the enabled extensions 
-ERROR: 53 compilation errors.  No code generated.
+ERROR: 58 compilation errors.  No code generated.


 Shader version: 430
--- a/Test/baseResults/440.frag.out
+++ b/Test/baseResults/440.frag.out
@@ -19,11 +19,13 @@ ERROR: 0:35: 'layout' : offset/align can only be used on a uniform or buffer
 ERROR: 0:37: 'offset' : only applies to block members, not blocks 
 ERROR: 0:38: 'layout' : offset/align can only be used on a uniform or buffer 
 ERROR: 0:38: 'offset' : only applies to block members, not blocks 
+ERROR: 0:39: 'out' : cannot declare an output block in a fragment shader 
 ERROR: 0:39: 'layout' : offset/align can only be used on a uniform or buffer 
 ERROR: 0:39: 'offset' : only applies to block members, not blocks 
 ERROR: 0:42: 'offset/align' : can only be used with std140 or std430 layout packing 
 ERROR: 0:43: 'offset/align' : can only be used with std140 or std430 layout packing 
 ERROR: 0:43: 'layout' : offset/align can only be used on a uniform or buffer 
+ERROR: 0:44: 'out' : cannot declare an output block in a fragment shader 
 ERROR: 0:44: 'offset/align' : can only be used with std140 or std430 layout packing 
 ERROR: 0:44: 'layout' : offset/align can only be used on a uniform or buffer 
 ERROR: 0:46: 'offset' : cannot specify on a variable declaration 
@@ -45,7 +47,7 @@ ERROR: 0:85: 'offset' : must be a multiple of the member's alignment
 ERROR: 0:103: 'align' : must be a power of 2 
 ERROR: 0:102: 'offset' : cannot lie in previous members 
 ERROR: 0:104: 'offset' : must be a multiple of the member's alignment 
-ERROR: 45 compilation errors.  No code generated.
+ERROR: 47 compilation errors.  No code generated.


 Shader version: 440
--- a/Test/baseResults/440.vert.out
+++ b/Test/baseResults/440.vert.out
@@ -18,7 +18,7 @@ ERROR: 0:54: 'component' : type overflows the available 4 components
 ERROR: 0:55: 'component' : type overflows the available 4 components 
 ERROR: 0:57: 'component' : cannot apply to a matrix, structure, or block 
 ERROR: 0:58: 'component' : cannot apply to a matrix, structure, or block 
-ERROR: 0:61: 'location' : cannot declare a default, use a full declaration 
+ERROR: 0:61: 'location/component/index' : cannot declare a default, use a full declaration 
 ERROR: 0:81: 'xfb layout qualifier' : can only be used on an output 
 ERROR: 0:87: 'xfb_offset' : cannot declare a default, use a full declaration 
 ERROR: 0:97: 'xfb_buffer' : member cannot contradict block (or what block inherited from global) 
--- a/Test/baseResults/specExamples.frag.out
+++ b/Test/baseResults/specExamples.frag.out
@@ -14,8 +14,6 @@ ERROR: 0:99: 'local_size_x' : there is no such layout identifier for this stage
 ERROR: 0:99: 'local_size_y' : there is no such layout identifier for this stage taking an assigned value 
 ERROR: 0:100: 'local_size_x' : there is no such layout identifier for this stage taking an assigned value 
 ERROR: 0:102: 'color' : redefinition 
-ERROR: 0:103: 'index' : there is no such layout identifier for this stage taking an assigned value 
-ERROR: 0:104: 'location' : overlapping use of location 3
 ERROR: 0:112: 'redeclaration' : all redeclarations must use the same depth layout on gl_FragDepth
 ERROR: 0:118: 'redeclaration' : all redeclarations must use the same depth layout on gl_FragDepth
 ERROR: 0:121: 'redeclaration' : all redeclarations must use the same depth layout on gl_FragDepth
@@ -43,7 +41,7 @@ ERROR: 0:226: 'in' : not allowed in nested scope
 ERROR: 0:227: 'in' : not allowed in nested scope 
 ERROR: 0:228: 'in' : not allowed in nested scope 
 ERROR: 0:232: 'out' : not allowed in nested scope 
-ERROR: 43 compilation errors.  No code generated.
+ERROR: 41 compilation errors.  No code generated.


 Shader version: 430
@@ -289,7 +287,7 @@ ERROR: node is still EOpNull!
 0:?     'Materiala' (in block{in 4-component vector of float Color, in 2-component vector of float TexCoord})
 0:?     'gl_FragCoord' (gl_FragCoord 4-component vector of float)
 0:?     'gl_FragCoord' (gl_FragCoord 4-component vector of float)
-0:?     'factor' (layout(location=3 ) out 4-component vector of float)
+0:?     'factor' (layout(location=3 index=1 ) out 4-component vector of float)
 0:?     'colors' (layout(location=2 ) out 3-element array of 4-component vector of float)
 0:?     'gl_FragDepth' (gl_FragDepth float)
 0:?     'gl_FragDepth' (gl_FragDepth float)
@@ -543,7 +541,7 @@ ERROR: node is still EOpNull!
 0:?     'Materiala' (in block{in 4-component vector of float Color, in 2-component vector of float TexCoord})
 0:?     'gl_FragCoord' (gl_FragCoord 4-component vector of float)
 0:?     'gl_FragCoord' (gl_FragCoord 4-component vector of float)
-0:?     'factor' (layout(location=3 ) out 4-component vector of float)
+0:?     'factor' (layout(location=3 index=1 ) out 4-component vector of float)
 0:?     'colors' (layout(location=2 ) out 3-element array of 4-component vector of float)
 0:?     'gl_FragDepth' (gl_FragDepth float)
 0:?     'gl_FragDepth' (gl_FragDepth float)