BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add limit checking for constant texture texel offsets and max_vertices.

Browse source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24158 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2013-11-20 23:46:57 +00:00
parent 1e91f5ee8d
commit 1d1132d9eb
11 changed files with 193 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Test/baseResults/300.frag.out
View file

@ -4,7 +4,13 @@ ERROR: 0:30: 'noperspective' : not supported with this profile: es
ERROR: 0:31: 'sampler2D' : sampler/image types can only be used in uniform variables or function parameters: bads
ERROR: 0:32: 'uint' : cannot apply precision statement to this type; use 'float', 'int' or a sampler type
ERROR: 0:39: 'structure' : non-uniform struct contains a sampler or image: badout
ERROR: 0:60: 'texel offset' : argument must be compile-time constant
ERROR: 0:63: 'texel offset' : argument must be compile-time constant
ERROR: 0:64: 'texel offset' : argument must be compile-time constant
ERROR: 0:66: 'texel offset' : argument must be compile-time constant
ERROR: 0:68: 'texel offset' : argument must be compile-time constant
ERROR: 0:69: 'variable indexing sampler array' : not supported with this profile: es
ERROR: 0:73: 'texel offset' : argument must be compile-time constant
ERROR: 0:83: 'double' : Reserved word.
ERROR: 0:83: 'double' : not supported with this profile: es
ERROR: 0:84: 'dvec2' : Reserved word.
@ -25,9 +31,11 @@ ERROR: 0:121: '==' : can't use with samplers or structs containing samplers
ERROR: 0:121: '==' : wrong operand types: no operation '==' exists that takes a left-hand operand of type 'lowp sampler2D' and a right operand of type 'lowp sampler2D' (or there is no acceptable conversion)
ERROR: 0:122: '=' : can't use with samplers or structs containing samplers
ERROR: 0:123: '==' : can't use with samplers or structs containing samplers
ERROR: 0:126: 'imageBuffer' : Reserved word.
ERROR: 0:126: '' : syntax error
ERROR: 28 compilation errors. No code generated.
ERROR: 0:129: 'texel offset' : value is out of range: [gl_MinProgramTexelOffset, gl_MaxProgramTexelOffset]
ERROR: 0:129: 'texel offset' : value is out of range: [gl_MinProgramTexelOffset, gl_MaxProgramTexelOffset]
ERROR: 0:132: 'imageBuffer' : Reserved word.
ERROR: 0:132: '' : syntax error
ERROR: 36 compilation errors. No code generated.
ERROR: node is still EOpNull!
@ -255,6 +263,23 @@ ERROR: node is still EOpNull!
0:123 Compare Equal (bool)
0:123 'inSt2' (in structure{i,s})
0:123 'st1' (uniform structure{i,s})
0:126 Function Definition: foo23( (void)
0:126 Function Parameters:
0:128 Sequence
0:128 Function Call: textureOffset(sS21;vf3;vi2;f1; (lowp float)
0:128 's2DShadow' (uniform lowp sampler2DShadow)
0:128 'c3D' (smooth in lowp 3-component vector of float)
0:128 Constant:
0:128 -8 (const int)
0:128 7 (const int)
0:128 'c1D' (smooth in lowp float)
0:129 Function Call: textureOffset(sS21;vf3;vi2;f1; (lowp float)
0:129 's2DShadow' (uniform lowp sampler2DShadow)
0:129 'c3D' (smooth in lowp 3-component vector of float)
0:129 Constant:
0:129 -9 (const int)
0:129 8 (const int)
0:129 'c1D' (smooth in lowp float)
0:? Linker Objects
0:? 's2D' (uniform lowp sampler2D)
0:? 's3D' (uniform lowp sampler3D)

58
Test/baseResults/400.frag.out
View file

@ -7,7 +7,12 @@ ERROR: 0:36: 'location qualifier on uniform or buffer' : not supported for this
ERROR: 0:38: 'redeclaration' : cannot apply layout qualifier to gl_Color
ERROR: 0:39: 'redeclaration' : cannot change qualification of gl_ClipDistance
ERROR: 0:41: 'gl_FragCoord' : cannot redeclare after use
ERROR: 7 compilation errors. No code generated.
ERROR: 0:49: 'texel offset' : argument must be compile-time constant
ERROR: 0:51: 'texel offset' : value is out of range: [gl_MinProgramTexelOffset, gl_MaxProgramTexelOffset]
ERROR: 0:51: 'texel offset' : value is out of range: [gl_MinProgramTexelOffset, gl_MaxProgramTexelOffset]
ERROR: 0:52: 'texel offset' : value is out of range: [gl_MinProgramTexelOffset, gl_MaxProgramTexelOffset]
ERROR: 0:52: 'texel offset' : value is out of range: [gl_MinProgramTexelOffset, gl_MaxProgramTexelOffset]
ERROR: 12 compilation errors. No code generated.
gl_FragCoord pixel center is integer
@ -116,6 +121,56 @@ ERROR: node is still EOpNull!
0:25 move second child to first child (4-component vector of float)
0:25 'c' (4-component vector of float)
0:25 'gl_FragCoord' (gl_FragCoord 4-component vector of float)
0:45 Function Definition: foo23( (void)
0:45 Function Parameters:
0:? Sequence
0:49 Function Call: textureProjGradOffset(sSR21;vf4;vf2;vf2;vi2; (float)
0:49 'u2drs' (uniform sampler2DRectShadow)
0:49 'outp' (out 4-component vector of float)
0:49 Constant:
0:49 0.000000
0:49 0.000000
0:49 Constant:
0:49 0.000000
0:49 0.000000
0:49 Convert float to int (2-component vector of int)
0:49 'c2D' (smooth in 2-component vector of float)
0:50 Function Call: textureProjGradOffset(sSR21;vf4;vf2;vf2;vi2; (float)
0:50 'u2drs' (uniform sampler2DRectShadow)
0:50 'outp' (out 4-component vector of float)
0:50 Constant:
0:50 0.000000
0:50 0.000000
0:50 Constant:
0:50 0.000000
0:50 0.000000
0:50 Constant:
0:50 3 (const int)
0:50 4 (const int)
0:51 Function Call: textureProjGradOffset(sSR21;vf4;vf2;vf2;vi2; (float)
0:51 'u2drs' (uniform sampler2DRectShadow)
0:51 'outp' (out 4-component vector of float)
0:51 Constant:
0:51 0.000000
0:51 0.000000
0:51 Constant:
0:51 0.000000
0:51 0.000000
0:51 Constant:
0:51 15 (const int)
0:51 16 (const int)
0:52 Function Call: textureProjGradOffset(sSR21;vf4;vf2;vf2;vi2; (float)
0:52 'u2drs' (uniform sampler2DRectShadow)
0:52 'outp' (out 4-component vector of float)
0:52 Constant:
0:52 0.000000
0:52 0.000000
0:52 Constant:
0:52 0.000000
0:52 0.000000
0:52 Constant:
0:52 -10 (const int)
0:52 20 (const int)
0:? Linker Objects
0:? 'c2D' (smooth in 2-component vector of float)
0:? 'i' (flat in int)
@ -131,6 +186,7 @@ ERROR: node is still EOpNull!
0:? '__anon__0' (in block{gl_FogFragCoord,gl_TexCoord,gl_Color,gl_SecondaryColor})
0:? 'gl_FragCoord' (gl_FragCoord 4-component vector of float)
0:? 'gl_FragCoord' (gl_FragCoord 4-component vector of float)
0:? 'u2drs' (uniform sampler2DRectShadow)
Linked fragment stage:

24
Test/baseResults/newTexture.frag.out
View file

@ -31,7 +31,9 @@ Warning, version 430 is not yet complete; some version-specific features are pre
0:39 Function Call: textureOffset(sS21;vf3;vi2;f1; (float)
0:39 's2DShadow' (uniform sampler2DShadow)
0:39 'c3D' (smooth in 3-component vector of float)
0:39 'ic2D' (flat in 2-component vector of int)
0:39 Constant:
0:39 3 (const int)
0:39 3 (const int)
0:39 'c1D' (smooth in float)
0:40 add second child into first child (4-component vector of float)
0:40 'v' (4-component vector of float)
@ -56,14 +58,18 @@ Warning, version 430 is not yet complete; some version-specific features are pre
0:42 's2DShadow' (uniform sampler2DShadow)
0:42 'c3D' (smooth in 3-component vector of float)
0:42 'c1D' (smooth in float)
0:42 'ic2D' (flat in 2-component vector of int)
0:42 Constant:
0:42 3 (const int)
0:42 3 (const int)
0:43 add second child into first child (4-component vector of float)
0:43 'v' (4-component vector of float)
0:43 Function Call: textureProjLodOffset(s21;vf3;f1;vi2; (4-component vector of float)
0:43 's2D' (uniform sampler2D)
0:43 'c3D' (smooth in 3-component vector of float)
0:43 'c1D' (smooth in float)
0:43 'ic2D' (flat in 2-component vector of int)
0:43 Constant:
0:43 3 (const int)
0:43 3 (const int)
0:44 add second child into first child (4-component vector of float)
0:44 'v' (4-component vector of float)
0:44 Function Call: textureGrad(sC1;vf3;vf3;vf3; (4-component vector of float)
@ -81,7 +87,9 @@ Warning, version 430 is not yet complete; some version-specific features are pre
0:45 'c4D' (smooth in 4-component vector of float)
0:45 'c2D' (smooth in 2-component vector of float)
0:45 'c2D' (smooth in 2-component vector of float)
0:45 'ic2D' (flat in 2-component vector of int)
0:45 Constant:
0:45 3 (const int)
0:45 3 (const int)
0:46 add second child into first child (4-component vector of float)
0:46 'v' (4-component vector of float)
0:46 Function Call: textureProjGrad(s31;vf4;vf3;vf3; (4-component vector of float)
@ -96,7 +104,9 @@ Warning, version 430 is not yet complete; some version-specific features are pre
0:47 'c3D' (smooth in 3-component vector of float)
0:47 'c2D' (smooth in 2-component vector of float)
0:47 'c2D' (smooth in 2-component vector of float)
0:47 'ic2D' (flat in 2-component vector of int)
0:47 Constant:
0:47 3 (const int)
0:47 3 (const int)
0:49 Sequence
0:49 move second child to first child (4-component vector of int)
0:49 'iv' (4-component vector of int)
@ -112,7 +122,9 @@ Warning, version 430 is not yet complete; some version-specific features are pre
0:51 Function Call: textureProjOffset(is21;vf4;vi2; (4-component vector of int)
0:51 'is2D' (uniform isampler2D)
0:51 'c4D' (smooth in 4-component vector of float)
0:51 'ic2D' (flat in 2-component vector of int)
0:51 Constant:
0:51 3 (const int)
0:51 3 (const int)
0:52 add second child into first child (4-component vector of float)
0:52 'v' (4-component vector of float)
0:52 Convert int to float (4-component vector of float)

14
Test/baseResults/texture.frag.out
View file

@ -214,12 +214,6 @@ WARNING: 0:15: varying deprecated in version 130; may be removed in future relea
0:63 'gradY' (2-component vector of float)
0:63 dPdy (2-component vector of float)
0:63 'coords2D' (smooth in 2-component vector of float)
0:64 Sequence
0:64 move second child to first child (2-component vector of int)
0:64 'offset' (2-component vector of int)
0:64 Constant:
0:64 3 (const int)
0:64 -7 (const int)
0:66 add second child into first child (4-component vector of float)
0:66 'color' (4-component vector of float)
0:66 Function Call: textureGrad(s21;vf2;vf2;vf2; (4-component vector of float)
@ -243,7 +237,9 @@ WARNING: 0:15: varying deprecated in version 130; may be removed in future relea
0:68 'coords2D' (smooth in 2-component vector of float)
0:68 'gradX' (2-component vector of float)
0:68 'gradY' (2-component vector of float)
0:68 'offset' (2-component vector of int)
0:68 Constant:
0:68 3 (const int)
0:68 -7 (const int)
0:69 add second child into first child (4-component vector of float)
0:69 'color' (4-component vector of float)
0:69 Function Call: textureProjGradOffset(s21;vf3;vf2;vf2;vi2; (4-component vector of float)
@ -251,7 +247,9 @@ WARNING: 0:15: varying deprecated in version 130; may be removed in future relea
0:69 'coords3D' (3-component vector of float)
0:69 'gradX' (2-component vector of float)
0:69 'gradY' (2-component vector of float)
0:69 'offset' (2-component vector of int)
0:69 Constant:
0:69 3 (const int)
0:69 -7 (const int)
0:70 add second child into first child (4-component vector of float)
0:70 'color' (4-component vector of float)
0:70 Function Call: textureGrad(sS21;vf3;vf2;vf2; (float)