glslang AST output: include global vs. temp (local) in the printed output. This only effects test results, but a future check-in is going to fix some globals.
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@30973 e7fa87d3-cd2b-0410-9028-fcbf551c1848
diff --git a/Test/baseResults/structAssignment.frag.out b/Test/baseResults/structAssignment.frag.out
index 5792b49..6c66d3c 100644
--- a/Test/baseResults/structAssignment.frag.out
+++ b/Test/baseResults/structAssignment.frag.out
@@ -3,15 +3,15 @@
Shader version: 130
0:? Sequence
-0:29 Function Definition: main( (void)
+0:29 Function Definition: main( (global void)
0:29 Function Parameters:
0:? Sequence
-0:33 Test condition and select (void)
+0:33 Test condition and select (temp void)
0:33 Condition
-0:33 Compare Greater Than (bool)
-0:33 i: direct index for structure (int)
-0:33 s2_1: direct index for structure (structure{int i, float f, structure{int i, float f} s1_1})
-0:33 'foo3' (uniform structure{structure{int i, float f, structure{int i, float f} s1_1} s2_1, int i, float f, structure{int i, float f} s1_1})
+0:33 Compare Greater Than (temp bool)
+0:33 i: direct index for structure (global int)
+0:33 s2_1: direct index for structure (global structure{global int i, global float f, global structure{global int i, global float f} s1_1})
+0:33 'foo3' (uniform structure{global structure{global int i, global float f, global structure{global int i, global float f} s1_1} s2_1, global int i, global float f, global structure{global int i, global float f} s1_1})
0:33 Constant:
0:33 0 (const int)
0:33 Constant:
@@ -19,35 +19,35 @@
0:33 Constant:
0:33 0 (const int)
0:33 true case
-0:34 move second child to first child (structure{int i, float f, structure{int i, float f} s1_1})
-0:34 'locals2' (structure{int i, float f, structure{int i, float f} s1_1})
-0:34 s2_1: direct index for structure (structure{int i, float f, structure{int i, float f} s1_1})
-0:34 'foo3' (uniform structure{structure{int i, float f, structure{int i, float f} s1_1} s2_1, int i, float f, structure{int i, float f} s1_1})
+0:34 move second child to first child (temp structure{global int i, global float f, global structure{global int i, global float f} s1_1})
+0:34 'locals2' (temp structure{global int i, global float f, global structure{global int i, global float f} s1_1})
+0:34 s2_1: direct index for structure (global structure{global int i, global float f, global structure{global int i, global float f} s1_1})
+0:34 'foo3' (uniform structure{global structure{global int i, global float f, global structure{global int i, global float f} s1_1} s2_1, global int i, global float f, global structure{global int i, global float f} s1_1})
0:34 Constant:
0:34 0 (const int)
0:33 false case
-0:36 move second child to first child (structure{int i, float f, structure{int i, float f} s1_1})
-0:36 'locals2' (structure{int i, float f, structure{int i, float f} s1_1})
-0:36 'foo2' (uniform structure{int i, float f, structure{int i, float f} s1_1})
-0:38 move second child to first child (4-component vector of float)
+0:36 move second child to first child (temp structure{global int i, global float f, global structure{global int i, global float f} s1_1})
+0:36 'locals2' (temp structure{global int i, global float f, global structure{global int i, global float f} s1_1})
+0:36 'foo2' (uniform structure{global int i, global float f, global structure{global int i, global float f} s1_1})
+0:38 move second child to first child (temp 4-component vector of float)
0:38 'gl_FragColor' (fragColor 4-component vector of float)
-0:38 vector-scale (4-component vector of float)
-0:38 f: direct index for structure (float)
-0:38 s1_1: direct index for structure (structure{int i, float f})
-0:38 'locals2' (structure{int i, float f, structure{int i, float f} s1_1})
+0:38 vector-scale (temp 4-component vector of float)
+0:38 f: direct index for structure (global float)
+0:38 s1_1: direct index for structure (global structure{global int i, global float f})
+0:38 'locals2' (temp structure{global int i, global float f, global structure{global int i, global float f} s1_1})
0:38 Constant:
0:38 2 (const int)
0:38 Constant:
0:38 1 (const int)
-0:38 Function Call: texture2D(s21;vf2; (4-component vector of float)
+0:38 Function Call: texture2D(s21;vf2; (global 4-component vector of float)
0:38 'sampler' (uniform sampler2D)
0:38 'coord' (smooth in 2-component vector of float)
0:? Linker Objects
0:? 'sampler' (uniform sampler2D)
0:? 'coord' (smooth in 2-component vector of float)
-0:? 'foo' (uniform structure{int i, float f})
-0:? 'foo2' (uniform structure{int i, float f, structure{int i, float f} s1_1})
-0:? 'foo3' (uniform structure{structure{int i, float f, structure{int i, float f} s1_1} s2_1, int i, float f, structure{int i, float f} s1_1})
+0:? 'foo' (uniform structure{global int i, global float f})
+0:? 'foo2' (uniform structure{global int i, global float f, global structure{global int i, global float f} s1_1})
+0:? 'foo3' (uniform structure{global structure{global int i, global float f, global structure{global int i, global float f} s1_1} s2_1, global int i, global float f, global structure{global int i, global float f} s1_1})
Linked fragment stage:
@@ -55,15 +55,15 @@
Shader version: 130
0:? Sequence
-0:29 Function Definition: main( (void)
+0:29 Function Definition: main( (global void)
0:29 Function Parameters:
0:? Sequence
-0:33 Test condition and select (void)
+0:33 Test condition and select (temp void)
0:33 Condition
-0:33 Compare Greater Than (bool)
-0:33 i: direct index for structure (int)
-0:33 s2_1: direct index for structure (structure{int i, float f, structure{int i, float f} s1_1})
-0:33 'foo3' (uniform structure{structure{int i, float f, structure{int i, float f} s1_1} s2_1, int i, float f, structure{int i, float f} s1_1})
+0:33 Compare Greater Than (temp bool)
+0:33 i: direct index for structure (global int)
+0:33 s2_1: direct index for structure (global structure{global int i, global float f, global structure{global int i, global float f} s1_1})
+0:33 'foo3' (uniform structure{global structure{global int i, global float f, global structure{global int i, global float f} s1_1} s2_1, global int i, global float f, global structure{global int i, global float f} s1_1})
0:33 Constant:
0:33 0 (const int)
0:33 Constant:
@@ -71,33 +71,33 @@
0:33 Constant:
0:33 0 (const int)
0:33 true case
-0:34 move second child to first child (structure{int i, float f, structure{int i, float f} s1_1})
-0:34 'locals2' (structure{int i, float f, structure{int i, float f} s1_1})
-0:34 s2_1: direct index for structure (structure{int i, float f, structure{int i, float f} s1_1})
-0:34 'foo3' (uniform structure{structure{int i, float f, structure{int i, float f} s1_1} s2_1, int i, float f, structure{int i, float f} s1_1})
+0:34 move second child to first child (temp structure{global int i, global float f, global structure{global int i, global float f} s1_1})
+0:34 'locals2' (temp structure{global int i, global float f, global structure{global int i, global float f} s1_1})
+0:34 s2_1: direct index for structure (global structure{global int i, global float f, global structure{global int i, global float f} s1_1})
+0:34 'foo3' (uniform structure{global structure{global int i, global float f, global structure{global int i, global float f} s1_1} s2_1, global int i, global float f, global structure{global int i, global float f} s1_1})
0:34 Constant:
0:34 0 (const int)
0:33 false case
-0:36 move second child to first child (structure{int i, float f, structure{int i, float f} s1_1})
-0:36 'locals2' (structure{int i, float f, structure{int i, float f} s1_1})
-0:36 'foo2' (uniform structure{int i, float f, structure{int i, float f} s1_1})
-0:38 move second child to first child (4-component vector of float)
+0:36 move second child to first child (temp structure{global int i, global float f, global structure{global int i, global float f} s1_1})
+0:36 'locals2' (temp structure{global int i, global float f, global structure{global int i, global float f} s1_1})
+0:36 'foo2' (uniform structure{global int i, global float f, global structure{global int i, global float f} s1_1})
+0:38 move second child to first child (temp 4-component vector of float)
0:38 'gl_FragColor' (fragColor 4-component vector of float)
-0:38 vector-scale (4-component vector of float)
-0:38 f: direct index for structure (float)
-0:38 s1_1: direct index for structure (structure{int i, float f})
-0:38 'locals2' (structure{int i, float f, structure{int i, float f} s1_1})
+0:38 vector-scale (temp 4-component vector of float)
+0:38 f: direct index for structure (global float)
+0:38 s1_1: direct index for structure (global structure{global int i, global float f})
+0:38 'locals2' (temp structure{global int i, global float f, global structure{global int i, global float f} s1_1})
0:38 Constant:
0:38 2 (const int)
0:38 Constant:
0:38 1 (const int)
-0:38 Function Call: texture2D(s21;vf2; (4-component vector of float)
+0:38 Function Call: texture2D(s21;vf2; (global 4-component vector of float)
0:38 'sampler' (uniform sampler2D)
0:38 'coord' (smooth in 2-component vector of float)
0:? Linker Objects
0:? 'sampler' (uniform sampler2D)
0:? 'coord' (smooth in 2-component vector of float)
-0:? 'foo' (uniform structure{int i, float f})
-0:? 'foo2' (uniform structure{int i, float f, structure{int i, float f} s1_1})
-0:? 'foo3' (uniform structure{structure{int i, float f, structure{int i, float f} s1_1} s2_1, int i, float f, structure{int i, float f} s1_1})
+0:? 'foo' (uniform structure{global int i, global float f})
+0:? 'foo2' (uniform structure{global int i, global float f, global structure{global int i, global float f} s1_1})
+0:? 'foo3' (uniform structure{global structure{global int i, global float f, global structure{global int i, global float f} s1_1} s2_1, global int i, global float f, global structure{global int i, global float f} s1_1})