mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

420Pack: Implement length() on vectors and matrices. Also, tweak line-continuation semantics to understand the extension.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@26601 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2014-05-10 22:24:50 +00:00
parent 7c257eb108
commit 0b9e112da6
14 changed files with 286 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Test/baseResults/120.vert.out
View File

@@ -11,9 +11,9 @@ ERROR: 0:21: 'assign' : l-value required (can't modify a const)
ERROR: 0:28: 'length' : array must be declared with a size before using this method
ERROR: 0:31: 'length' : incomplete method syntax
ERROR: 0:32: 'length' : method does not accept any arguments
ERROR: 0:33: 'flizbit' : only the length method is supported for array
ERROR: 0:33: 'flizbit' : does not apply to this type: 7-element array of float
ERROR: 0:33: '=' : cannot convert from '7-element array of float' to 'int'
ERROR: 0:34: 'flizbit' : only the length method is supported for array
ERROR: 0:34: 'flizbit' : does not apply to this type: 7-element array of float
ERROR: 0:34: 'f' : can't use function syntax on variable
ERROR: 0:34: 'a4' : redefinition
ERROR: 0:35: 'arrays of arrays' : not supported with this profile: none
@@ -123,7 +123,7 @@ ERROR: node is still EOpNull!
0:32 move second child to first child (int)
0:32 'a3' (int)
0:32 Constant:
0:32 12 (const int)
0:32 1 (const int)
0:43 move second child to first child (float)
0:43 'gl_PointSize' (invariant gl_PointSize float)
0:43 Constant:
@@ -442,7 +442,7 @@ ERROR: node is still EOpNull!
0:32 move second child to first child (int)
0:32 'a3' (int)
0:32 Constant:
0:32 12 (const int)
0:32 1 (const int)
0:43 move second child to first child (float)
0:43 'gl_PointSize' (invariant gl_PointSize float)
0:43 Constant:

175
Test/baseResults/130.frag.out
View File

@@ -13,17 +13,22 @@ ERROR: 0:81: 'textureGatherOffset(...)' : not supported for this version or the
ERROR: 0:84: 'textureGatherOffset(...)' : not supported for this version or the enabled extensions
ERROR: 0:85: 'textureGatherOffset(...)' : not supported for this version or the enabled extensions
WARNING: 0:88: '#extension' : extension is only partially supported: GL_ARB_gpu_shader5
WARNING: 0:120: '#extension' : extension is only partially supported: GL_ARB_shading_language_420pack
ERROR: 0:123: 'uniform block' : not supported for this version or the enabled extensions
ERROR: 0:130: '.' : field selection not allowed on matrix
ERROR: 0:130: 'm43' : can't use function syntax on variable
ERROR: 0:130: '=' : cannot convert from 'const float' to 'int'
ERROR: 0:132: 'gl_MinProgramTexelOffset' : undeclared identifier
ERROR: 0:132: 'gl_MaxProgramTexelOffset' : undeclared identifier
ERROR: 0:135: 'gl_FogFragCoord' : identifiers starting with "gl_" are reserved
ERROR: 0:140: 'int' : must be qualified as flat in
ERROR: 0:140: 'redeclaration' : cannot change the type of gl_FogFragCoord
ERROR: 21 compilation errors. No code generated.
ERROR: 0:120: 'line continuation' : not supported for this version or the enabled extensions
WARNING: 0:123: '#extension' : extension is only partially supported: GL_ARB_shading_language_420pack
ERROR: 0:126: 'uniform block' : not supported for this version or the enabled extensions
ERROR: 0:138: 'gl_MinProgramTexelOffset' : undeclared identifier
ERROR: 0:138: 'gl_MaxProgramTexelOffset' : undeclared identifier
ERROR: 0:140: 'length' : does not operate on this type: bool
ERROR: 0:140: 'boolb' : can't use function syntax on variable
ERROR: 0:141: 'length' : does not operate on this type: float
ERROR: 0:141: '' : function call, method, or subroutine call expected
ERROR: 0:141: '' : no matching overloaded function found
ERROR: 0:142: 'length' : incomplete method syntax
ERROR: 0:143: 'length' : method does not accept any arguments
ERROR: 0:146: 'gl_FogFragCoord' : identifiers starting with "gl_" are reserved
ERROR: 0:151: 'int' : must be qualified as flat in
ERROR: 0:151: 'redeclaration' : cannot change the type of gl_FogFragCoord
ERROR: 26 compilation errors. No code generated.
Shader version: 130
@@ -300,34 +305,53 @@ ERROR: node is still EOpNull!
0:117 0.200000
0:117 0.200000
0:117 0.200000
0:126 Function Definition: bar23444( (void)
0:126 Function Parameters:
0:129 Function Definition: bar23444( (void)
0:129 Function Parameters:
0:? Sequence
0:129 Sequence
0:129 move second child to first child (float)
0:129 'a1' (float)
0:129 direct index (float)
0:129 direct index (3-component vector of float)
0:129 'm43' (4X3 matrix of float)
0:129 Constant:
0:129 3 (const int)
0:129 Constant:
0:129 1 (const int)
0:131 Sequence
0:131 move second child to first child (float)
0:131 'b' (const (read only) float)
0:131 component-wise multiply (float)
0:131 Constant:
0:131 2.000000
0:131 'a1' (float)
0:132 move second child to first child (float)
0:132 direct index (float)
0:132 'a' (3-component vector of float)
0:132 Constant:
0:132 0 (const int)
0:132 add (float)
0:132 'gl_MinProgramTexelOffset' (float)
0:132 'gl_MaxProgramTexelOffset' (float)
0:132 Sequence
0:132 move second child to first child (float)
0:132 'a1' (float)
0:132 direct index (float)
0:132 direct index (3-component vector of float)
0:132 'm43' (4X3 matrix of float)
0:132 Constant:
0:132 3 (const int)
0:132 Constant:
0:132 1 (const int)
0:134 Sequence
0:134 move second child to first child (int)
0:134 'a2' (int)
0:134 Constant:
0:134 4 (const int)
0:135 add second child into first child (int)
0:135 'a2' (int)
0:135 Constant:
0:135 3 (const int)
0:136 add second child into first child (int)
0:136 'a2' (int)
0:136 Constant:
0:136 3 (const int)
0:137 Sequence
0:137 move second child to first child (float)
0:137 'b' (const (read only) float)
0:137 component-wise multiply (float)
0:137 Constant:
0:137 2.000000
0:137 'a1' (float)
0:138 move second child to first child (float)
0:138 direct index (float)
0:138 'a' (3-component vector of float)
0:138 Constant:
0:138 0 (const int)
0:138 add (float)
0:138 'gl_MinProgramTexelOffset' (float)
0:138 'gl_MaxProgramTexelOffset' (float)
0:140 Constant:
0:140 0.000000
0:141 Constant:
0:141 0.000000
0:143 Constant:
0:143 1 (const int)
0:? Linker Objects
0:? 'a' (3-component vector of float)
0:? 'b' (float)
@@ -349,6 +373,7 @@ ERROR: node is still EOpNull!
0:? 'Isca' (uniform isamplerCubeArray)
0:? 'Usca' (uniform usamplerCubeArray)
0:? 'Scas' (uniform samplerCubeArrayShadow)
0:? 'x' (int)
0:? 'ai' (const 3-element array of int)
0:? 10 (const int)
0:? 23 (const int)
@@ -635,34 +660,53 @@ ERROR: node is still EOpNull!
0:117 0.200000
0:117 0.200000
0:117 0.200000
0:126 Function Definition: bar23444( (void)
0:126 Function Parameters:
0:129 Function Definition: bar23444( (void)
0:129 Function Parameters:
0:? Sequence
0:129 Sequence
0:129 move second child to first child (float)
0:129 'a1' (float)
0:129 direct index (float)
0:129 direct index (3-component vector of float)
0:129 'm43' (4X3 matrix of float)
0:129 Constant:
0:129 3 (const int)
0:129 Constant:
0:129 1 (const int)
0:131 Sequence
0:131 move second child to first child (float)
0:131 'b' (const (read only) float)
0:131 component-wise multiply (float)
0:131 Constant:
0:131 2.000000
0:131 'a1' (float)
0:132 move second child to first child (float)
0:132 direct index (float)
0:132 'a' (3-component vector of float)
0:132 Constant:
0:132 0 (const int)
0:132 add (float)
0:132 'gl_MinProgramTexelOffset' (float)
0:132 'gl_MaxProgramTexelOffset' (float)
0:132 Sequence
0:132 move second child to first child (float)
0:132 'a1' (float)
0:132 direct index (float)
0:132 direct index (3-component vector of float)
0:132 'm43' (4X3 matrix of float)
0:132 Constant:
0:132 3 (const int)
0:132 Constant:
0:132 1 (const int)
0:134 Sequence
0:134 move second child to first child (int)
0:134 'a2' (int)
0:134 Constant:
0:134 4 (const int)
0:135 add second child into first child (int)
0:135 'a2' (int)
0:135 Constant:
0:135 3 (const int)
0:136 add second child into first child (int)
0:136 'a2' (int)
0:136 Constant:
0:136 3 (const int)
0:137 Sequence
0:137 move second child to first child (float)
0:137 'b' (const (read only) float)
0:137 component-wise multiply (float)
0:137 Constant:
0:137 2.000000
0:137 'a1' (float)
0:138 move second child to first child (float)
0:138 direct index (float)
0:138 'a' (3-component vector of float)
0:138 Constant:
0:138 0 (const int)
0:138 add (float)
0:138 'gl_MinProgramTexelOffset' (float)
0:138 'gl_MaxProgramTexelOffset' (float)
0:140 Constant:
0:140 0.000000
0:141 Constant:
0:141 0.000000
0:143 Constant:
0:143 1 (const int)
0:? Linker Objects
0:? 'a' (3-component vector of float)
0:? 'b' (float)
@@ -684,6 +728,7 @@ ERROR: node is still EOpNull!
0:? 'Isca' (uniform isamplerCubeArray)
0:? 'Usca' (uniform usamplerCubeArray)
0:? 'Scas' (uniform samplerCubeArrayShadow)
0:? 'x' (int)
0:? 'ai' (const 3-element array of int)
0:? 10 (const int)
0:? 23 (const int)

2
Test/baseResults/150.tesc.out
View File

@@ -533,7 +533,7 @@ Warning, version 400 is not yet complete; most version-specific features are pre
ERROR: 0:7: 'vertices' : inconsistent output number of vertices for array size of gl_out
ERROR: 0:11: 'vertices' : inconsistent output number of vertices for array size of a
ERROR: 0:12: 'vertices' : inconsistent output number of vertices for array size of outb
ERROR: 0:26: 'gl_PointSize' : no such field in structure
ERROR: 0:26: 'gl_PointSize' : no such field in structure
ERROR: 0:26: 'assign' : cannot convert from 'float' to 'block{out 4-component vector of float gl_Position}'
ERROR: 0:29: 'out' : type must be an array: outf
ERROR: 6 compilation errors. No code generated.

2
Test/baseResults/410.geom.out
View File

@@ -3,7 +3,7 @@ Warning, version 410 is not yet complete; most version-specific features are pre
ERROR: 0:8: 'myIn' : cannot redeclare a built-in block with a user name
ERROR: 0:12: 'gl_myIn' : no declaration found for redeclaration
ERROR: 0:20: 'gl_PerVertex' : can only redeclare a built-in block once, and before any use
ERROR: 0:32: 'gl_Position' : no such field in structure
ERROR: 0:32: 'gl_Position' : no such field in structure
ERROR: 0:32: '=' : cannot convert from 'block{in float gl_PointSize}' to '4-component vector of float'
ERROR: 0:33: 'gl_Position' : member of nameless block was not redeclared
ERROR: 0:33: 'assign' : cannot convert from 'const 4-component vector of float' to 'layout(stream=0 ) gl_Position void'

2
Test/baseResults/420.tesc.out
View File

@@ -3,7 +3,7 @@ Warning, version 400 is not yet complete; most version-specific features are pre
ERROR: 0:7: 'vertices' : inconsistent output number of vertices for array size of gl_out
ERROR: 0:11: 'vertices' : inconsistent output number of vertices for array size of a
ERROR: 0:12: 'vertices' : inconsistent output number of vertices for array size of outb
ERROR: 0:26: 'gl_PointSize' : no such field in structure
ERROR: 0:26: 'gl_PointSize' : no such field in structure
ERROR: 0:26: 'assign' : cannot convert from 'float' to 'block{out 4-component vector of float gl_Position}'
ERROR: 0:29: 'out' : type must be an array: outf
ERROR: 6 compilation errors. No code generated.

71
Test/baseResults/420.vert.out
View File

@@ -31,7 +31,10 @@ ERROR: 0:76: 'binding' : sampler binding not less than gl_MaxCombinedTextureImag
ERROR: 0:85: 'patch' : not supported in this stage: vertex
ERROR: 0:85: '' : vertex input cannot be further qualified
ERROR: 0:86: 'patch' : not supported in this stage: vertex
ERROR: 30 compilation errors. No code generated.
ERROR: 0:97: 'gl_MinProgramTexelOffset' : undeclared identifier
ERROR: 0:97: 'gl_MaxProgramTexelOffset' : undeclared identifier
ERROR: 0:97: '=' : cannot convert from 'float' to 'int'
ERROR: 33 compilation errors. No code generated.
Shader version: 420
@@ -105,6 +108,39 @@ ERROR: node is still EOpNull!
0:61 'f' (float)
0:62 'f' (float)
0:63 'f' (float)
0:88 Function Definition: bar23444( (void)
0:88 Function Parameters:
0:? Sequence
0:91 Sequence
0:91 move second child to first child (float)
0:91 'a1' (float)
0:91 direct index (float)
0:91 direct index (3-component vector of float)
0:91 'm43' (4X3 matrix of float)
0:91 Constant:
0:91 3 (const int)
0:91 Constant:
0:91 1 (const int)
0:93 Sequence
0:93 move second child to first child (int)
0:93 'a2' (int)
0:93 Constant:
0:93 4 (const int)
0:94 add second child into first child (int)
0:94 'a2' (int)
0:94 Constant:
0:94 3 (const int)
0:95 add second child into first child (int)
0:95 'a2' (int)
0:95 Constant:
0:95 3 (const int)
0:96 Sequence
0:96 move second child to first child (float)
0:96 'b' (const (read only) float)
0:96 component-wise multiply (float)
0:96 Constant:
0:96 2.000000
0:96 'a1' (float)
0:? Linker Objects
0:? 'v2' (smooth out 2-component vector of float)
0:? 'bad' (in 10-element array of 4-component vector of float)
@@ -215,6 +251,39 @@ ERROR: node is still EOpNull!
0:61 'f' (float)
0:62 'f' (float)
0:63 'f' (float)
0:88 Function Definition: bar23444( (void)
0:88 Function Parameters:
0:? Sequence
0:91 Sequence
0:91 move second child to first child (float)
0:91 'a1' (float)
0:91 direct index (float)
0:91 direct index (3-component vector of float)
0:91 'm43' (4X3 matrix of float)
0:91 Constant:
0:91 3 (const int)
0:91 Constant:
0:91 1 (const int)
0:93 Sequence
0:93 move second child to first child (int)
0:93 'a2' (int)
0:93 Constant:
0:93 4 (const int)
0:94 add second child into first child (int)
0:94 'a2' (int)
0:94 Constant:
0:94 3 (const int)
0:95 add second child into first child (int)
0:95 'a2' (int)
0:95 Constant:
0:95 3 (const int)
0:96 Sequence
0:96 move second child to first child (float)
0:96 'b' (const (read only) float)
0:96 component-wise multiply (float)
0:96 Constant:
0:96 2.000000
0:96 'a1' (float)
0:? Linker Objects
0:? 'v2' (smooth out 2-component vector of float)
0:? 'bad' (in 10-element array of 4-component vector of float)

2
Test/baseResults/matrixError.vert.out
View File

@@ -3,7 +3,7 @@ ERROR: 0:10: 'constructor' : too many arguments
ERROR: 0:7: 'const' : non-matching or non-convertible constant type for const initializer
ERROR: 0:17: 'assign' : cannot convert from '2-component vector of float' to '3-component vector of float'
ERROR: 0:18: 'assign' : cannot convert from '2-component vector of float' to '3-component vector of float'
ERROR: 0:19: '.' : field selection not allowed on matrix
ERROR: 0:19: 'xy' : does not apply to this type: 2X3 matrix of float
ERROR: 0:21: '[' : matrix index out of range '2'
ERROR: 0:21: '[' : vector index out of range '4'
ERROR: 7 compilation errors. No code generated.

13
Test/baseResults/specExamples.frag.out
View File

@@ -27,21 +27,18 @@ ERROR: 0:150: '=' : cannot convert from 'const float' to '3-element array of 4-
ERROR: 0:152: 'constructor' : cannot convert parameter 1 from 'const 2-element array of 4-component vector of float' to '4-component vector of float'
ERROR: 0:172: 'x' : undeclared identifier
ERROR: 0:172: '[]' : scalar integer expression required
ERROR: 0:172: 'length' : illegal vector field selection
ERROR: 0:172: '' : function call, method, or subroutine call expected
ERROR: 0:172: '' : no matching overloaded function found
ERROR: 0:175: 'x' : undeclared identifier
ERROR: 0:175: '[]' : scalar integer expression required
ERROR: 0:175: 'b' : left of '[' is not of type array, matrix, or vector
ERROR: 0:175: 'a' : vector field selection out of range
ERROR: 0:175: 'length' : illegal vector field selection
ERROR: 0:175: 'length' : does not operate on this type: const float
ERROR: 0:175: '' : function call, method, or subroutine call expected
ERROR: 0:175: '' : no matching overloaded function found
ERROR: 0:178: '[]' : scalar integer expression required
ERROR: 0:178: 's' : undeclared identifier
ERROR: 0:178: 's' : left of '[' is not of type array, matrix, or vector
ERROR: 0:178: 'a' : vector field selection out of range
ERROR: 0:178: 'length' : illegal vector field selection
ERROR: 0:178: 'length' : does not operate on this type: const float
ERROR: 0:178: '' : function call, method, or subroutine call expected
ERROR: 0:178: '' : no matching overloaded function found
ERROR: 0:198: 'e' : redefinition
@@ -49,7 +46,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: 49 compilation errors. No code generated.
ERROR: 46 compilation errors. No code generated.
Shader version: 430
@@ -196,7 +193,7 @@ ERROR: node is still EOpNull!
0:171 Constant:
0:171 3 (const int)
0:172 Constant:
0:172 0.000000
0:172 4 (const int)
0:175 Constant:
0:175 0.000000
0:178 Constant:
@@ -448,7 +445,7 @@ ERROR: node is still EOpNull!
0:171 Constant:
0:171 3 (const int)
0:172 Constant:
0:172 0.000000
0:172 4 (const int)
0:175 Constant:
0:175 0.000000
0:178 Constant: