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

Finish GL_ARB_shading_language_420pack: *ProgramTexelOffset built-in constants. Also, make comma operation not fold constants.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@26602 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2014-05-11 01:07:31 +00:00
parent 0b9e112da6
commit bae44b74d4
9 changed files with 73 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Test/420.vert
View File

@@ -96,3 +96,6 @@ void bar23444()
const float b = 2 * a1;
int a = gl_MinProgramTexelOffset + gl_MaxProgramTexelOffset;
}
const int comma0 = (2, 3); // ERROR
int comma1[(2, 3)]; // ERROR

2
Test/430.vert
View File

@@ -71,7 +71,7 @@ layout(std140) uniform blocke {
layout(offset = 32) vec3 b; // ERROR
} spinste;
int aconste[gl_MaxTransformFeedbackBuffers]; // ERROR ??
int aconste[gl_MaxTransformFeedbackBuffers]; // ERROR
int bconste[gl_MaxTransformFeedbackInterleavedComponents]; // ERROR
out bblck2 {

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

@@ -14,10 +14,7 @@ ERROR: 0:84: 'textureGatherOffset(...)' : not supported for this version or the
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
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
@@ -28,7 +25,7 @@ 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.
ERROR: 24 compilation errors. No code generated.
Shader version: 130
@@ -343,9 +340,8 @@ ERROR: node is still EOpNull!
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:138 Constant:
0:138 -1.000000
0:140 Constant:
0:140 0.000000
0:141 Constant:
@@ -698,9 +694,8 @@ ERROR: node is still EOpNull!
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:138 Constant:
0:138 -1.000000
0:140 Constant:
0:140 0.000000
0:141 Constant:

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

@@ -31,9 +31,9 @@ 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: 0:97: 'gl_MinProgramTexelOffset' : undeclared identifier
ERROR: 0:97: 'gl_MaxProgramTexelOffset' : undeclared identifier
ERROR: 0:97: '=' : cannot convert from 'float' to 'int'
ERROR: 0:100: '=' : global const initializers must be constant 'const int'
ERROR: 0:101: '' : constant expression required
ERROR: 0:101: '' : array size must be a constant integer expression
ERROR: 33 compilation errors. No code generated.
@@ -141,6 +141,11 @@ ERROR: node is still EOpNull!
0:96 Constant:
0:96 2.000000
0:96 'a1' (float)
0:97 Sequence
0:97 move second child to first child (int)
0:97 'a' (int)
0:97 Constant:
0:97 -1 (const int)
0:? Linker Objects
0:? 'v2' (smooth out 2-component vector of float)
0:? 'bad' (in 10-element array of 4-component vector of float)
@@ -173,6 +178,8 @@ ERROR: node is still EOpNull!
0:? 'anon@3' (out block{out implicitly-sized array of float gl_ClipDistance, })
0:? 'patchIn' (patch in 4-component vector of float)
0:? 'patchOut' (smooth patch out 4-component vector of float)
0:? 'comma0' (int)
0:? 'comma1' (1-element array of int)
0:? 'gl_VertexID' (gl_VertexId int)
0:? 'gl_InstanceID' (gl_InstanceId int)
@@ -284,6 +291,11 @@ ERROR: node is still EOpNull!
0:96 Constant:
0:96 2.000000
0:96 'a1' (float)
0:97 Sequence
0:97 move second child to first child (int)
0:97 'a' (int)
0:97 Constant:
0:97 -1 (const int)
0:? Linker Objects
0:? 'v2' (smooth out 2-component vector of float)
0:? 'bad' (in 10-element array of 4-component vector of float)
@@ -316,6 +328,8 @@ ERROR: node is still EOpNull!
0:? 'anon@3' (out block{out 1-element array of float gl_ClipDistance, })
0:? 'patchIn' (patch in 4-component vector of float)
0:? 'patchOut' (smooth patch out 4-component vector of float)
0:? 'comma0' (int)
0:? 'comma1' (1-element array of int)
0:? 'gl_VertexID' (gl_VertexId int)
0:? 'gl_InstanceID' (gl_InstanceId int)

20
Test/baseResults/cppNest.vert.out
View File

@@ -64,8 +64,14 @@ ERROR: node is still EOpNull!
0:175 Function Definition: foo985( (void)
0:175 Function Parameters:
0:175 Sequence
0:175 Constant:
0:175 6 (const int)
0:175 add (int)
0:175 Constant:
0:175 2 (const int)
0:175 Comma (int)
0:175 Constant:
0:175 3 (const int)
0:175 Constant:
0:175 4 (const int)
0:? Linker Objects
0:? 'sum' (float)
0:? 'selected4' (int)
@@ -132,8 +138,14 @@ ERROR: node is still EOpNull!
0:175 Function Definition: foo985( (void)
0:175 Function Parameters:
0:175 Sequence
0:175 Constant:
0:175 6 (const int)
0:175 add (int)
0:175 Constant:
0:175 2 (const int)
0:175 Comma (int)
0:175 Constant:
0:175 3 (const int)
0:175 Constant:
0:175 4 (const int)
0:? Linker Objects
0:? 'sum' (float)
0:? 'selected4' (int)