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

HLSL: fix copies between arrays of structs of builtins, and arrayed builtins.

Browse Source 
Structs are split to remove builtin members to create valid SPIR-V.  In this
process, an outer structure array dimension may be propegated onto the
now-removed builtin variables.  For example, a mystruct[3].position ->
position[3].  The copy between the split and unsplit forms would handle
this in some cases, but not if the array dimension was at different levels
of aggregate.

It now does this, but may not handle arbitrary composite types.  Unclear if
that has any semantic meaning for builtins though.
This commit is contained in:
steve-lunarg
2017-02-02 16:32:02 -07:00
committed by John Kessenich
parent abd8dca86d
commit ec712ebea1
5 changed files with 473 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

312
Test/baseResults/hlsl.struct.split.trivial.geom.out
View File

@@ -5,10 +5,10 @@ max_vertices = 3
input primitive = triangles
output primitive = triangle_strip
0:? Sequence
0:14 Function Definition: main(struct-PS_IN-vf41[3];struct-GS_OUT-vf41; (temp void)
0:14 Function Definition: @main(struct-PS_IN-vf41[3];struct-GS_OUT-vf41; (temp void)
0:14 Function Parameters:
0:14 'i' (in 3-element array of structure{temp 4-component vector of float Position pos})
0:14 'ts' (out structure{temp 4-component vector of float Position pos})
0:14 'i' (in 3-element array of structure{temp 4-component vector of float pos})
0:14 'ts' (out structure{temp 4-component vector of float pos})
0:? Sequence
0:17 Sequence
0:17 move second child to first child (temp int)
@@ -28,24 +28,65 @@ output primitive = triangle_strip
0:18 'o' (temp structure{temp 4-component vector of float pos})
0:18 Constant:
0:18 0 (const int)
0:18 indirect index (temp 4-component vector of float Position)
0:18 'i_pos' (in 3-element array of 4-component vector of float Position)
0:18 'x' (temp int)
0:18 pos: direct index for structure (temp 4-component vector of float)
0:18 indirect index (temp structure{temp 4-component vector of float pos})
0:18 'i' (in 3-element array of structure{temp 4-component vector of float pos})
0:18 'x' (temp int)
0:18 Constant:
0:18 0 (const int)
0:19 Sequence
0:19 Sequence
0:19 move second child to first child (temp 4-component vector of float)
0:? 'ts_pos' (out 4-component vector of float Position)
0:19 pos: direct index for structure (temp 4-component vector of float)
0:19 'o' (temp structure{temp 4-component vector of float pos})
0:19 Constant:
0:19 0 (const int)
0:19 move second child to first child (temp structure{temp 4-component vector of float pos})
0:19 'ts' (out structure{temp 4-component vector of float pos})
0:19 'o' (temp structure{temp 4-component vector of float pos})
0:19 EmitVertex (temp void)
0:17 Loop Terminal Expression
0:17 Pre-Increment (temp int)
0:17 'x' (temp int)
0:14 Function Definition: main( (temp void)
0:14 Function Parameters:
0:? Sequence
0:14 Sequence
0:14 move second child to first child (temp 4-component vector of float)
0:14 pos: direct index for structure (temp 4-component vector of float)
0:14 direct index (temp structure{temp 4-component vector of float pos})
0:? 'i' (temp 3-element array of structure{temp 4-component vector of float pos})
0:14 Constant:
0:14 0 (const int)
0:14 Constant:
0:14 0 (const int)
0:14 direct index (in 4-component vector of float Position)
0:? 'i_pos' (in 3-element array of 4-component vector of float Position)
0:14 Constant:
0:14 0 (const int)
0:14 move second child to first child (temp 4-component vector of float)
0:14 pos: direct index for structure (temp 4-component vector of float)
0:14 direct index (temp structure{temp 4-component vector of float pos})
0:? 'i' (temp 3-element array of structure{temp 4-component vector of float pos})
0:14 Constant:
0:14 1 (const int)
0:14 Constant:
0:14 0 (const int)
0:14 direct index (in 4-component vector of float Position)
0:? 'i_pos' (in 3-element array of 4-component vector of float Position)
0:14 Constant:
0:14 1 (const int)
0:14 move second child to first child (temp 4-component vector of float)
0:14 pos: direct index for structure (temp 4-component vector of float)
0:14 direct index (temp structure{temp 4-component vector of float pos})
0:? 'i' (temp 3-element array of structure{temp 4-component vector of float pos})
0:14 Constant:
0:14 2 (const int)
0:14 Constant:
0:14 0 (const int)
0:14 direct index (in 4-component vector of float Position)
0:? 'i_pos' (in 3-element array of 4-component vector of float Position)
0:14 Constant:
0:14 2 (const int)
0:14 Function Call: @main(struct-PS_IN-vf41[3];struct-GS_OUT-vf41; (temp void)
0:? 'i' (temp 3-element array of structure{temp 4-component vector of float pos})
0:? 'ts' (temp structure{temp 4-component vector of float pos})
0:? Linker Objects
0:? 'PerVertex_in' (in 3-element array of block{in 4-component vector of float Position i_pos})
0:? 'PerVertex_out' (out block{out 4-component vector of float Position ts_pos})
Linked geometry stage:
@@ -57,10 +98,10 @@ max_vertices = 3
input primitive = triangles
output primitive = triangle_strip
0:? Sequence
0:14 Function Definition: main(struct-PS_IN-vf41[3];struct-GS_OUT-vf41; (temp void)
0:14 Function Definition: @main(struct-PS_IN-vf41[3];struct-GS_OUT-vf41; (temp void)
0:14 Function Parameters:
0:14 'i' (in 3-element array of structure{temp 4-component vector of float Position pos})
0:14 'ts' (out structure{temp 4-component vector of float Position pos})
0:14 'i' (in 3-element array of structure{temp 4-component vector of float pos})
0:14 'ts' (out structure{temp 4-component vector of float pos})
0:? Sequence
0:17 Sequence
0:17 move second child to first child (temp int)
@@ -80,113 +121,180 @@ output primitive = triangle_strip
0:18 'o' (temp structure{temp 4-component vector of float pos})
0:18 Constant:
0:18 0 (const int)
0:18 indirect index (temp 4-component vector of float Position)
0:18 'i_pos' (in 3-element array of 4-component vector of float Position)
0:18 'x' (temp int)
0:18 pos: direct index for structure (temp 4-component vector of float)
0:18 indirect index (temp structure{temp 4-component vector of float pos})
0:18 'i' (in 3-element array of structure{temp 4-component vector of float pos})
0:18 'x' (temp int)
0:18 Constant:
0:18 0 (const int)
0:19 Sequence
0:19 Sequence
0:19 move second child to first child (temp 4-component vector of float)
0:? 'ts_pos' (out 4-component vector of float Position)
0:19 pos: direct index for structure (temp 4-component vector of float)
0:19 'o' (temp structure{temp 4-component vector of float pos})
0:19 Constant:
0:19 0 (const int)
0:19 move second child to first child (temp structure{temp 4-component vector of float pos})
0:19 'ts' (out structure{temp 4-component vector of float pos})
0:19 'o' (temp structure{temp 4-component vector of float pos})
0:19 EmitVertex (temp void)
0:17 Loop Terminal Expression
0:17 Pre-Increment (temp int)
0:17 'x' (temp int)
0:14 Function Definition: main( (temp void)
0:14 Function Parameters:
0:? Sequence
0:14 Sequence
0:14 move second child to first child (temp 4-component vector of float)
0:14 pos: direct index for structure (temp 4-component vector of float)
0:14 direct index (temp structure{temp 4-component vector of float pos})
0:? 'i' (temp 3-element array of structure{temp 4-component vector of float pos})
0:14 Constant:
0:14 0 (const int)
0:14 Constant:
0:14 0 (const int)
0:14 direct index (in 4-component vector of float Position)
0:? 'i_pos' (in 3-element array of 4-component vector of float Position)
0:14 Constant:
0:14 0 (const int)
0:14 move second child to first child (temp 4-component vector of float)
0:14 pos: direct index for structure (temp 4-component vector of float)
0:14 direct index (temp structure{temp 4-component vector of float pos})
0:? 'i' (temp 3-element array of structure{temp 4-component vector of float pos})
0:14 Constant:
0:14 1 (const int)
0:14 Constant:
0:14 0 (const int)
0:14 direct index (in 4-component vector of float Position)
0:? 'i_pos' (in 3-element array of 4-component vector of float Position)
0:14 Constant:
0:14 1 (const int)
0:14 move second child to first child (temp 4-component vector of float)
0:14 pos: direct index for structure (temp 4-component vector of float)
0:14 direct index (temp structure{temp 4-component vector of float pos})
0:? 'i' (temp 3-element array of structure{temp 4-component vector of float pos})
0:14 Constant:
0:14 2 (const int)
0:14 Constant:
0:14 0 (const int)
0:14 direct index (in 4-component vector of float Position)
0:? 'i_pos' (in 3-element array of 4-component vector of float Position)
0:14 Constant:
0:14 2 (const int)
0:14 Function Call: @main(struct-PS_IN-vf41[3];struct-GS_OUT-vf41; (temp void)
0:? 'i' (temp 3-element array of structure{temp 4-component vector of float pos})
0:? 'ts' (temp structure{temp 4-component vector of float pos})
0:? Linker Objects
0:? 'PerVertex_in' (in 3-element array of block{in 4-component vector of float Position i_pos})
0:? 'PerVertex_out' (out block{out 4-component vector of float Position ts_pos})
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 49
// Id's are bound by 67
Capability Geometry
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Geometry 4 "main" 28 36 45 48
EntryPoint Geometry 4 "main" 46 66
ExecutionMode 4 Triangles
ExecutionMode 4 Invocations 1
ExecutionMode 4 OutputTriangleStrip
ExecutionMode 4 OutputVertices 3
Name 4 "main"
Name 8 "x"
Name 21 "GS_OUT"
MemberName 21(GS_OUT) 0 "pos"
Name 23 "o"
Name 28 "i_pos"
Name 36 "ts_pos"
Name 42 "PerVertex_in"
MemberName 42(PerVertex_in) 0 "i_pos"
Name 45 "PerVertex_in"
Name 46 "PerVertex_out"
MemberName 46(PerVertex_out) 0 "ts_pos"
Name 48 "PerVertex_out"
Decorate 28(i_pos) BuiltIn Position
Decorate 36(ts_pos) BuiltIn Position
MemberDecorate 42(PerVertex_in) 0 BuiltIn Position
Decorate 42(PerVertex_in) Block
MemberDecorate 46(PerVertex_out) 0 BuiltIn Position
Decorate 46(PerVertex_out) Block
Name 8 "PS_IN"
MemberName 8(PS_IN) 0 "pos"
Name 13 "GS_OUT"
MemberName 13(GS_OUT) 0 "pos"
Name 18 "@main(struct-PS_IN-vf41[3];struct-GS_OUT-vf41;"
Name 16 "i"
Name 17 "ts"
Name 22 "x"
Name 33 "o"
Name 43 "i"
Name 46 "i_pos"
Name 58 "ts"
Name 59 "param"
Name 61 "param"
Name 63 "PerVertex_in"
MemberName 63(PerVertex_in) 0 "i_pos"
Name 66 "PerVertex_in"
Decorate 46(i_pos) BuiltIn Position
MemberDecorate 63(PerVertex_in) 0 BuiltIn Position
Decorate 63(PerVertex_in) Block
2: TypeVoid
3: TypeFunction 2
6: TypeInt 32 1
7: TypePointer Function 6(int)
9: 6(int) Constant 0
16: 6(int) Constant 3
17: TypeBool
19: TypeFloat 32
20: TypeVector 19(float) 4
21(GS_OUT): TypeStruct 20(fvec4)
22: TypePointer Function 21(GS_OUT)
24: TypeInt 32 0
25: 24(int) Constant 3
26: TypeArray 20(fvec4) 25
27: TypePointer Input 26
28(i_pos): 27(ptr) Variable Input
30: TypePointer Input 20(fvec4)
33: TypePointer Function 20(fvec4)
35: TypePointer Output 20(fvec4)
36(ts_pos): 35(ptr) Variable Output
40: 6(int) Constant 1
42(PerVertex_in): TypeStruct 20(fvec4)
43: TypeArray 42(PerVertex_in) 25
44: TypePointer Input 43
45(PerVertex_in): 44(ptr) Variable Input
46(PerVertex_out): TypeStruct 20(fvec4)
47: TypePointer Output 46(PerVertex_out)
48(PerVertex_out): 47(ptr) Variable Output
6: TypeFloat 32
7: TypeVector 6(float) 4
8(PS_IN): TypeStruct 7(fvec4)
9: TypeInt 32 0
10: 9(int) Constant 3
11: TypeArray 8(PS_IN) 10
12: TypePointer Function 11
13(GS_OUT): TypeStruct 7(fvec4)
14: TypePointer Function 13(GS_OUT)
15: TypeFunction 2 12(ptr) 14(ptr)
20: TypeInt 32 1
21: TypePointer Function 20(int)
23: 20(int) Constant 0
30: 20(int) Constant 3
31: TypeBool
35: TypePointer Function 7(fvec4)
41: 20(int) Constant 1
44: TypeArray 7(fvec4) 10
45: TypePointer Input 44
46(i_pos): 45(ptr) Variable Input
47: TypePointer Input 7(fvec4)
54: 20(int) Constant 2
63(PerVertex_in): TypeStruct 7(fvec4)
64: TypeArray 63(PerVertex_in) 10
65: TypePointer Input 64
66(PerVertex_in): 65(ptr) Variable Input
4(main): 2 Function None 3
5: Label
8(x): 7(ptr) Variable Function
23(o): 22(ptr) Variable Function
Store 8(x) 9
Branch 10
10: Label
LoopMerge 12 13 None
Branch 14
14: Label
15: 6(int) Load 8(x)
18: 17(bool) SLessThan 15 16
BranchConditional 18 11 12
11: Label
29: 6(int) Load 8(x)
31: 30(ptr) AccessChain 28(i_pos) 29
32: 20(fvec4) Load 31
34: 33(ptr) AccessChain 23(o) 9
Store 34 32
37: 33(ptr) AccessChain 23(o) 9
38: 20(fvec4) Load 37
Store 36(ts_pos) 38
EmitVertex
Branch 13
13: Label
39: 6(int) Load 8(x)
41: 6(int) IAdd 39 40
Store 8(x) 41
Branch 10
12: Label
43(i): 12(ptr) Variable Function
58(ts): 14(ptr) Variable Function
59(param): 12(ptr) Variable Function
61(param): 14(ptr) Variable Function
48: 47(ptr) AccessChain 46(i_pos) 23
49: 7(fvec4) Load 48
50: 35(ptr) AccessChain 43(i) 23 23
Store 50 49
51: 47(ptr) AccessChain 46(i_pos) 41
52: 7(fvec4) Load 51
53: 35(ptr) AccessChain 43(i) 41 23
Store 53 52
55: 47(ptr) AccessChain 46(i_pos) 54
56: 7(fvec4) Load 55
57: 35(ptr) AccessChain 43(i) 54 23
Store 57 56
60: 11 Load 43(i)
Store 59(param) 60
62: 2 FunctionCall 18(@main(struct-PS_IN-vf41[3];struct-GS_OUT-vf41;) 59(param) 61(param)
Return
FunctionEnd
18(@main(struct-PS_IN-vf41[3];struct-GS_OUT-vf41;): 2 Function None 15
16(i): 12(ptr) FunctionParameter
17(ts): 14(ptr) FunctionParameter
19: Label
22(x): 21(ptr) Variable Function
33(o): 14(ptr) Variable Function
Store 22(x) 23
Branch 24
24: Label
LoopMerge 26 27 None
Branch 28
28: Label
29: 20(int) Load 22(x)
32: 31(bool) SLessThan 29 30
BranchConditional 32 25 26
25: Label
34: 20(int) Load 22(x)
36: 35(ptr) AccessChain 16(i) 34 23
37: 7(fvec4) Load 36
38: 35(ptr) AccessChain 33(o) 23
Store 38 37
39: 13(GS_OUT) Load 33(o)
Store 17(ts) 39
EmitVertex
Branch 27
27: Label
40: 20(int) Load 22(x)
42: 20(int) IAdd 40 41
Store 22(x) 42
Branch 24
26: Label
Return
FunctionEnd