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

HLSL: Wrap the entry-point; need to write 'in' args, and support 'inout' args.

Browse Source 
This needs some render testing, but is destined to be part of master.

This also leads to a variety of other simplifications.
 - IO are global symbols, so only need one list of linkage nodes (deferred)
 - no longer need parse-context-wide 'inEntryPoint' state, entry-point is localized
 - several parts of splitting/flattening are now localized
This commit is contained in:
John Kessenich
2017-01-19 15:41:47 -07:00
parent 18adbdbbb8
commit 02467d8d94
171 changed files with 37604 additions and 32679 deletions
Download Patch File Download Diff File Expand all files Collapse all files

203
Test/baseResults/hlsl.struct.split.trivial.vert.out
View File

@@ -1,7 +1,7 @@
hlsl.struct.split.trivial.vert
Shader version: 450
0:? Sequence
0:16 Function Definition: main(struct-VS_INPUT-vf41;vf4; (temp structure{temp 4-component vector of float Position Pos})
0:16 Function Definition: @main(struct-VS_INPUT-vf41;vf4; (temp structure{temp 4-component vector of float Position Pos})
0:16 Function Parameters:
0:16 'vsin' (in structure{temp 4-component vector of float Pos_in})
0:16 'Pos_loose' (in 4-component vector of float Position)
@@ -12,21 +12,39 @@ Shader version: 450
0:19 Constant:
0:19 0 (const int)
0:19 add (temp 4-component vector of float)
0:? 'Pos_in' (in 4-component vector of float Position)
0:19 Pos_in: direct index for structure (temp 4-component vector of float)
0:19 'vsin' (in structure{temp 4-component vector of float Pos_in})
0:19 Constant:
0:19 0 (const int)
0:19 'Pos_loose' (in 4-component vector of float Position)
0:21 Sequence
0:21 Sequence
0:21 move second child to first child (temp 4-component vector of float)
0:? 'Pos' (out 4-component vector of float Position)
0:21 Pos: direct index for structure (temp 4-component vector of float)
0:21 'vsout' (temp structure{temp 4-component vector of float Pos})
0:21 Constant:
0:21 0 (const int)
0:21 Branch: Return
0:21 Branch: Return with expression
0:21 'vsout' (temp structure{temp 4-component vector of float Pos})
0:16 Function Definition: main( (temp void)
0:16 Function Parameters:
0:? Sequence
0:16 Sequence
0:16 move second child to first child (temp 4-component vector of float)
0:16 Pos_in: direct index for structure (temp 4-component vector of float)
0:? 'vsin' (temp structure{temp 4-component vector of float Pos_in})
0:16 Constant:
0:16 0 (const int)
0:? 'Pos_in' (in 4-component vector of float Position)
0:16 move second child to first child (temp 4-component vector of float)
0:? 'Pos_loose' (temp 4-component vector of float)
0:? 'Pos_loose' (in 4-component vector of float Position)
0:16 Sequence
0:16 move second child to first child (temp 4-component vector of float)
0:? '@entryPointOutput_Pos' (out 4-component vector of float Position)
0:16 Pos: direct index for structure (temp 4-component vector of float Position)
0:16 Function Call: @main(struct-VS_INPUT-vf41;vf4; (temp structure{temp 4-component vector of float Position Pos})
0:? 'vsin' (temp structure{temp 4-component vector of float Pos_in})
0:? 'Pos_loose' (temp 4-component vector of float)
0:16 Constant:
0:16 0 (const int)
0:? Linker Objects
0:? 'Pos_in' (in 4-component vector of float Position)
0:? 'Pos_loose' (in 4-component vector of float Position)
0:? 'PerVertex_out' (out block{out 4-component vector of float Position Pos})
0:? 'PerVertex_out' (out block{out 4-component vector of float Position @entryPointOutput_Pos})
Linked vertex stage:
@@ -34,7 +52,7 @@ Linked vertex stage:
Shader version: 450
0:? Sequence
0:16 Function Definition: main(struct-VS_INPUT-vf41;vf4; (temp structure{temp 4-component vector of float Position Pos})
0:16 Function Definition: @main(struct-VS_INPUT-vf41;vf4; (temp structure{temp 4-component vector of float Position Pos})
0:16 Function Parameters:
0:16 'vsin' (in structure{temp 4-component vector of float Pos_in})
0:16 'Pos_loose' (in 4-component vector of float Position)
@@ -45,72 +63,133 @@ Shader version: 450
0:19 Constant:
0:19 0 (const int)
0:19 add (temp 4-component vector of float)
0:? 'Pos_in' (in 4-component vector of float Position)
0:19 Pos_in: direct index for structure (temp 4-component vector of float)
0:19 'vsin' (in structure{temp 4-component vector of float Pos_in})
0:19 Constant:
0:19 0 (const int)
0:19 'Pos_loose' (in 4-component vector of float Position)
0:21 Sequence
0:21 Sequence
0:21 move second child to first child (temp 4-component vector of float)
0:? 'Pos' (out 4-component vector of float Position)
0:21 Pos: direct index for structure (temp 4-component vector of float)
0:21 'vsout' (temp structure{temp 4-component vector of float Pos})
0:21 Constant:
0:21 0 (const int)
0:21 Branch: Return
0:21 Branch: Return with expression
0:21 'vsout' (temp structure{temp 4-component vector of float Pos})
0:16 Function Definition: main( (temp void)
0:16 Function Parameters:
0:? Sequence
0:16 Sequence
0:16 move second child to first child (temp 4-component vector of float)
0:16 Pos_in: direct index for structure (temp 4-component vector of float)
0:? 'vsin' (temp structure{temp 4-component vector of float Pos_in})
0:16 Constant:
0:16 0 (const int)
0:? 'Pos_in' (in 4-component vector of float Position)
0:16 move second child to first child (temp 4-component vector of float)
0:? 'Pos_loose' (temp 4-component vector of float)
0:? 'Pos_loose' (in 4-component vector of float Position)
0:16 Sequence
0:16 move second child to first child (temp 4-component vector of float)
0:? '@entryPointOutput_Pos' (out 4-component vector of float Position)
0:16 Pos: direct index for structure (temp 4-component vector of float Position)
0:16 Function Call: @main(struct-VS_INPUT-vf41;vf4; (temp structure{temp 4-component vector of float Position Pos})
0:? 'vsin' (temp structure{temp 4-component vector of float Pos_in})
0:? 'Pos_loose' (temp 4-component vector of float)
0:16 Constant:
0:16 0 (const int)
0:? Linker Objects
0:? 'Pos_in' (in 4-component vector of float Position)
0:? 'Pos_loose' (in 4-component vector of float Position)
0:? 'PerVertex_out' (out block{out 4-component vector of float Position Pos})
0:? 'PerVertex_out' (out block{out 4-component vector of float Position @entryPointOutput_Pos})
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 29
// Id's are bound by 54
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 14 16 22 28
EntryPoint Vertex 4 "main" 37 41 44 53
Name 4 "main"
Name 8 "VS_OUTPUT"
MemberName 8(VS_OUTPUT) 0 "Pos"
Name 10 "vsout"
Name 14 "Pos_in"
Name 16 "Pos_loose"
Name 22 "Pos"
Name 26 "PerVertex_out"
MemberName 26(PerVertex_out) 0 "Pos"
Name 28 "PerVertex_out"
Decorate 14(Pos_in) BuiltIn Position
Decorate 16(Pos_loose) BuiltIn Position
Decorate 22(Pos) BuiltIn Position
MemberDecorate 26(PerVertex_out) 0 BuiltIn Position
Decorate 26(PerVertex_out) Block
Name 8 "VS_INPUT"
MemberName 8(VS_INPUT) 0 "Pos_in"
Name 11 "VS_OUTPUT"
MemberName 11(VS_OUTPUT) 0 "Pos"
Name 15 "@main(struct-VS_INPUT-vf41;vf4;"
Name 13 "vsin"
Name 14 "Pos_loose"
Name 17 "VS_OUTPUT"
MemberName 17(VS_OUTPUT) 0 "Pos"
Name 19 "vsout"
Name 35 "vsin"
Name 37 "Pos_in"
Name 40 "Pos_loose"
Name 41 "Pos_loose"
Name 44 "@entryPointOutput_Pos"
Name 45 "param"
Name 47 "param"
Name 51 "PerVertex_out"
MemberName 51(PerVertex_out) 0 "@entryPointOutput_Pos"
Name 53 "PerVertex_out"
MemberDecorate 11(VS_OUTPUT) 0 BuiltIn Position
Decorate 37(Pos_in) BuiltIn Position
Decorate 41(Pos_loose) BuiltIn Position
Decorate 44(@entryPointOutput_Pos) BuiltIn Position
MemberDecorate 51(PerVertex_out) 0 BuiltIn Position
Decorate 51(PerVertex_out) Block
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
7: TypeVector 6(float) 4
8(VS_OUTPUT): TypeStruct 7(fvec4)
9: TypePointer Function 8(VS_OUTPUT)
11: TypeInt 32 1
12: 11(int) Constant 0
13: TypePointer Input 7(fvec4)
14(Pos_in): 13(ptr) Variable Input
16(Pos_loose): 13(ptr) Variable Input
19: TypePointer Function 7(fvec4)
21: TypePointer Output 7(fvec4)
22(Pos): 21(ptr) Variable Output
26(PerVertex_out): TypeStruct 7(fvec4)
27: TypePointer Output 26(PerVertex_out)
28(PerVertex_out): 27(ptr) Variable Output
8(VS_INPUT): TypeStruct 7(fvec4)
9: TypePointer Function 8(VS_INPUT)
10: TypePointer Function 7(fvec4)
11(VS_OUTPUT): TypeStruct 7(fvec4)
12: TypeFunction 11(VS_OUTPUT) 9(ptr) 10(ptr)
17(VS_OUTPUT): TypeStruct 7(fvec4)
18: TypePointer Function 17(VS_OUTPUT)
20: TypeInt 32 1
21: 20(int) Constant 0
28: TypePointer Function 11(VS_OUTPUT)
36: TypePointer Input 7(fvec4)
37(Pos_in): 36(ptr) Variable Input
41(Pos_loose): 36(ptr) Variable Input
43: TypePointer Output 7(fvec4)
44(@entryPointOutput_Pos): 43(ptr) Variable Output
51(PerVertex_out): TypeStruct 7(fvec4)
52: TypePointer Output 51(PerVertex_out)
53(PerVertex_out): 52(ptr) Variable Output
4(main): 2 Function None 3
5: Label
10(vsout): 9(ptr) Variable Function
15: 7(fvec4) Load 14(Pos_in)
17: 7(fvec4) Load 16(Pos_loose)
18: 7(fvec4) FAdd 15 17
20: 19(ptr) AccessChain 10(vsout) 12
Store 20 18
23: 19(ptr) AccessChain 10(vsout) 12
24: 7(fvec4) Load 23
Store 22(Pos) 24
35(vsin): 9(ptr) Variable Function
40(Pos_loose): 10(ptr) Variable Function
45(param): 9(ptr) Variable Function
47(param): 10(ptr) Variable Function
38: 7(fvec4) Load 37(Pos_in)
39: 10(ptr) AccessChain 35(vsin) 21
Store 39 38
42: 7(fvec4) Load 41(Pos_loose)
Store 40(Pos_loose) 42
46: 8(VS_INPUT) Load 35(vsin)
Store 45(param) 46
48: 7(fvec4) Load 40(Pos_loose)
Store 47(param) 48
49:11(VS_OUTPUT) FunctionCall 15(@main(struct-VS_INPUT-vf41;vf4;) 45(param) 47(param)
50: 7(fvec4) CompositeExtract 49 0
Store 44(@entryPointOutput_Pos) 50
Return
FunctionEnd
15(@main(struct-VS_INPUT-vf41;vf4;):11(VS_OUTPUT) Function None 12
13(vsin): 9(ptr) FunctionParameter
14(Pos_loose): 10(ptr) FunctionParameter
16: Label
19(vsout): 18(ptr) Variable Function
29: 28(ptr) Variable Function
22: 10(ptr) AccessChain 13(vsin) 21
23: 7(fvec4) Load 22
24: 7(fvec4) Load 14(Pos_loose)
25: 7(fvec4) FAdd 23 24
26: 10(ptr) AccessChain 19(vsout) 21
Store 26 25
27:17(VS_OUTPUT) Load 19(vsout)
30: 7(fvec4) CompositeExtract 27 0
31: 10(ptr) AccessChain 29 21
Store 31 30
32:11(VS_OUTPUT) Load 29
ReturnValue 32
FunctionEnd