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

HLSL: Correctly identify which variables are global storage class.

Browse Source
This commit is contained in:
John Kessenich
2016-07-01 19:35:53 -06:00
parent 532543c1c4
commit b0a63f578a
35 changed files with 995 additions and 979 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Test/baseResults/hlsl.swizzle.frag.out
View File

@@ -4,13 +4,13 @@ gl_FragCoord origin is upper left
0:? Sequence
0:1 Sequence
0:1 move second child to first child (temp 4-component vector of float)
0:1 'AmbientColor' (temp 4-component vector of float)
0:1 'AmbientColor' (global 4-component vector of float)
0:? Constant:
0:? 1.000000
0:? 0.500000
0:? 0.000000
0:? 1.000000
0:7 Function Definition: ShaderFunction(vf4; (temp 4-component vector of float)
0:7 Function Definition: ShaderFunction(vf4; (global 4-component vector of float)
0:4 Function Parameters:
0:4 'input' (in 4-component vector of float)
0:? Sequence
@@ -29,11 +29,11 @@ gl_FragCoord origin is upper left
0:5 0 (const int)
0:5 Construct vec4 (temp 4-component vector of float)
0:5 direct index (temp float)
0:5 'AmbientColor' (temp 4-component vector of float)
0:5 'AmbientColor' (global 4-component vector of float)
0:5 Constant:
0:5 2 (const int)
0:? Linker Objects
0:? 'AmbientColor' (temp 4-component vector of float)
0:? 'AmbientColor' (global 4-component vector of float)
Linked fragment stage:
@@ -44,13 +44,13 @@ gl_FragCoord origin is upper left
0:? Sequence
0:1 Sequence
0:1 move second child to first child (temp 4-component vector of float)
0:1 'AmbientColor' (temp 4-component vector of float)
0:1 'AmbientColor' (global 4-component vector of float)
0:? Constant:
0:? 1.000000
0:? 0.500000
0:? 0.000000
0:? 1.000000
0:7 Function Definition: ShaderFunction(vf4; (temp 4-component vector of float)
0:7 Function Definition: ShaderFunction(vf4; (global 4-component vector of float)
0:4 Function Parameters:
0:4 'input' (in 4-component vector of float)
0:? Sequence
@@ -69,15 +69,15 @@ gl_FragCoord origin is upper left
0:5 0 (const int)
0:5 Construct vec4 (temp 4-component vector of float)
0:5 direct index (temp float)
0:5 'AmbientColor' (temp 4-component vector of float)
0:5 'AmbientColor' (global 4-component vector of float)
0:5 Constant:
0:5 2 (const int)
0:? Linker Objects
0:? 'AmbientColor' (temp 4-component vector of float)
0:? 'AmbientColor' (global 4-component vector of float)
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 29
// Id's are bound by 30
Capability Shader
1: ExtInstImport "GLSL.std.450"
@@ -88,33 +88,34 @@ gl_FragCoord origin is upper left
Name 4 "PixelShaderFunction"
Name 11 "ShaderFunction(vf4;"
Name 10 "input"
Name 13 "AmbientColor"
Name 14 "AmbientColor"
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
7: TypeVector 6(float) 4
8: TypePointer Function 7(fvec4)
9: TypeFunction 7(fvec4) 8(ptr)
14: 6(float) Constant 1065353216
15: 6(float) Constant 1056964608
16: 6(float) Constant 0
17: 7(fvec4) ConstantComposite 14 15 16 14
20: TypeInt 32 0
21: 20(int) Constant 2
22: TypePointer Function 6(float)
13: TypePointer Private 7(fvec4)
14(AmbientColor): 13(ptr) Variable Private
15: 6(float) Constant 1065353216
16: 6(float) Constant 1056964608
17: 6(float) Constant 0
18: 7(fvec4) ConstantComposite 15 16 17 15
21: TypeInt 32 0
22: 21(int) Constant 2
23: TypePointer Private 6(float)
4(PixelShaderFunction): 2 Function None 3
5: Label
13(AmbientColor): 8(ptr) Variable Function
Store 13(AmbientColor) 17
Store 14(AmbientColor) 18
FunctionEnd
11(ShaderFunction(vf4;): 7(fvec4) Function None 9
10(input): 8(ptr) FunctionParameter
12: Label
18: 7(fvec4) Load 10(input)
19: 7(fvec4) VectorShuffle 18 18 3 3 1 0
23: 22(ptr) AccessChain 13(AmbientColor) 21
24: 6(float) Load 23
25: 7(fvec4) CompositeConstruct 24 24 24 24
26: 7(fvec4) FMul 19 25
ReturnValue 26
19: 7(fvec4) Load 10(input)
20: 7(fvec4) VectorShuffle 19 19 3 3 1 0
24: 23(ptr) AccessChain 14(AmbientColor) 22
25: 6(float) Load 24
26: 7(fvec4) CompositeConstruct 25 25 25 25
27: 7(fvec4) FMul 20 26
ReturnValue 27
FunctionEnd