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

Minor infrastructure changes, to simplify an upcoming check in:

Browse Source 
- print out block member types when printing a block (makes all test results change)
 - const versions of all intermediate.h type-identification methods
 - layoutSlotLocation -> layoutLocation

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24664 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2014-01-06 21:27:56 +00:00
parent 7054075804
commit 7cbfdf4394
50 changed files with 592 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,8 +200,8 @@ ERROR: node is still EOpNull!
0:178 Constant:
0:178 0.000000
0:193 Sequence
0:193 move second child to first child (structure{a,b})
0:193 'e' (structure{a,b})
0:193 move second child to first child (structure{float a, int b})
0:193 'e' (structure{float a, int b})
0:193 Constant:
0:193 1.200000
0:193 2 (const int)
@@ -270,10 +270,10 @@ ERROR: node is still EOpNull!
0:? 'm' (3X2 matrix of float)
0:? 'highPrecisionMVP' (4X4 matrix of double)
0:? 'dm' (2X4 matrix of double)
0:? 'lightVar' (structure{intensity,position})
0:? 'lightVar' (structure{float intensity, 3-component vector of float position})
0:? 'frequencies' (3-element array of float)
0:? 'lightPosition' (uniform 4-element array of 4-component vector of float)
0:? 'lights' (2-element array of structure{intensity,position})
0:? 'lights' (2-element array of structure{float intensity, 3-component vector of float position})
0:? 'numLights' (const int)
0:? 2 (const int)
0:? 'normal' (smooth in 3-component vector of float)
@@ -286,17 +286,17 @@ ERROR: node is still EOpNull!
0:? 0.700000
0:? 0.700000
0:? 0.200000
0:? '__anon__0' (in block{Color1,Color2,TexCoordA,Atten})
0:? '__anon__1' (in block{LightPos,LightColor})
0:? 'Materiala' (in block{Color,TexCoord})
0:? '__anon__0' (in block{smooth in 4-component vector of float Color1, smooth 4-component vector of float Color2, 2-component vector of float TexCoordA, uniform float Atten})
0:? '__anon__1' (in block{4-component vector of float LightPos, 3-component vector of float LightColor})
0:? 'Materiala' (in block{4-component vector of float Color, 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:? '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)
0:? '__anon__2' (in block{gl_FogFragCoord,gl_TexCoord,gl_Color,gl_SecondaryColor})
0:? '__anon__2' (in block{gl_FogFragCoord,gl_TexCoord,gl_Color,gl_SecondaryColor})
0:? '__anon__2' (in block{in float gl_FogFragCoord, in unsized array of 4-component vector of float gl_TexCoord, flat in 4-component vector of float gl_Color, in 4-component vector of float gl_SecondaryColor})
0:? '__anon__2' (in block{in float gl_FogFragCoord, in unsized array of 4-component vector of float gl_TexCoord, flat in 4-component vector of float gl_Color, in 4-component vector of float gl_SecondaryColor})
Linked fragment stage: