HLSL: Wrap the entry-point; need to write 'in' args, and support 'inout' args.
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
@@ -2,7 +2,7 @@ hlsl.logical.binary.frag
|
||||
Shader version: 450
|
||||
gl_FragCoord origin is upper left
|
||||
0:? Sequence
|
||||
0:12 Function Definition: main( (temp structure{temp 4-component vector of float Color})
|
||||
0:12 Function Definition: @main( (temp structure{temp 4-component vector of float Color})
|
||||
0:12 Function Parameters:
|
||||
0:? Sequence
|
||||
0:13 Test condition and select (temp void)
|
||||
@@ -45,15 +45,18 @@ gl_FragCoord origin is upper left
|
||||
0:17 1.000000
|
||||
0:17 1.000000
|
||||
0:17 1.000000
|
||||
0:18 Sequence
|
||||
0:18 Sequence
|
||||
0:18 move second child to first child (temp 4-component vector of float)
|
||||
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
|
||||
0:18 Color: direct index for structure (temp 4-component vector of float)
|
||||
0:18 'psout' (temp structure{temp 4-component vector of float Color})
|
||||
0:18 Constant:
|
||||
0:18 0 (const int)
|
||||
0:18 Branch: Return
|
||||
0:18 Branch: Return with expression
|
||||
0:18 'psout' (temp structure{temp 4-component vector of float Color})
|
||||
0:12 Function Definition: main( (temp void)
|
||||
0:12 Function Parameters:
|
||||
0:? Sequence
|
||||
0:12 Sequence
|
||||
0:12 move second child to first child (temp 4-component vector of float)
|
||||
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
|
||||
0:12 Color: direct index for structure (temp 4-component vector of float)
|
||||
0:12 Function Call: @main( (temp structure{temp 4-component vector of float Color})
|
||||
0:12 Constant:
|
||||
0:12 0 (const int)
|
||||
0:? Linker Objects
|
||||
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
|
||||
0:? 'anon@0' (layout(row_major std140 ) uniform block{layout(offset=0 ) uniform int ival, layout(offset=16 ) uniform 4-component vector of int ival4, layout(offset=32 ) uniform float fval, layout(offset=48 ) uniform 4-component vector of float fval4})
|
||||
@@ -65,7 +68,7 @@ Linked fragment stage:
|
||||
Shader version: 450
|
||||
gl_FragCoord origin is upper left
|
||||
0:? Sequence
|
||||
0:12 Function Definition: main( (temp structure{temp 4-component vector of float Color})
|
||||
0:12 Function Definition: @main( (temp structure{temp 4-component vector of float Color})
|
||||
0:12 Function Parameters:
|
||||
0:? Sequence
|
||||
0:13 Test condition and select (temp void)
|
||||
@@ -108,113 +111,123 @@ gl_FragCoord origin is upper left
|
||||
0:17 1.000000
|
||||
0:17 1.000000
|
||||
0:17 1.000000
|
||||
0:18 Sequence
|
||||
0:18 Sequence
|
||||
0:18 move second child to first child (temp 4-component vector of float)
|
||||
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
|
||||
0:18 Color: direct index for structure (temp 4-component vector of float)
|
||||
0:18 'psout' (temp structure{temp 4-component vector of float Color})
|
||||
0:18 Constant:
|
||||
0:18 0 (const int)
|
||||
0:18 Branch: Return
|
||||
0:18 Branch: Return with expression
|
||||
0:18 'psout' (temp structure{temp 4-component vector of float Color})
|
||||
0:12 Function Definition: main( (temp void)
|
||||
0:12 Function Parameters:
|
||||
0:? Sequence
|
||||
0:12 Sequence
|
||||
0:12 move second child to first child (temp 4-component vector of float)
|
||||
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
|
||||
0:12 Color: direct index for structure (temp 4-component vector of float)
|
||||
0:12 Function Call: @main( (temp structure{temp 4-component vector of float Color})
|
||||
0:12 Constant:
|
||||
0:12 0 (const int)
|
||||
0:? Linker Objects
|
||||
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
|
||||
0:? 'anon@0' (layout(row_major std140 ) uniform block{layout(offset=0 ) uniform int ival, layout(offset=16 ) uniform 4-component vector of int ival4, layout(offset=32 ) uniform float fval, layout(offset=48 ) uniform 4-component vector of float fval4})
|
||||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80001
|
||||
// Id's are bound by 57
|
||||
// Id's are bound by 62
|
||||
|
||||
Capability Shader
|
||||
1: ExtInstImport "GLSL.std.450"
|
||||
MemoryModel Logical GLSL450
|
||||
EntryPoint Fragment 4 "main" 53
|
||||
EntryPoint Fragment 4 "main" 59
|
||||
ExecutionMode 4 OriginUpperLeft
|
||||
Name 4 "main"
|
||||
Name 11 "$Global"
|
||||
MemberName 11($Global) 0 "ival"
|
||||
MemberName 11($Global) 1 "ival4"
|
||||
MemberName 11($Global) 2 "fval"
|
||||
MemberName 11($Global) 3 "fval4"
|
||||
Name 13 ""
|
||||
Name 45 "PS_OUTPUT"
|
||||
MemberName 45(PS_OUTPUT) 0 "Color"
|
||||
Name 47 "psout"
|
||||
Name 53 "Color"
|
||||
MemberDecorate 11($Global) 0 Offset 0
|
||||
MemberDecorate 11($Global) 1 Offset 16
|
||||
MemberDecorate 11($Global) 2 Offset 32
|
||||
MemberDecorate 11($Global) 3 Offset 48
|
||||
Decorate 11($Global) Block
|
||||
Decorate 13 DescriptorSet 0
|
||||
Decorate 53(Color) Location 0
|
||||
Name 8 "PS_OUTPUT"
|
||||
MemberName 8(PS_OUTPUT) 0 "Color"
|
||||
Name 10 "@main("
|
||||
Name 15 "$Global"
|
||||
MemberName 15($Global) 0 "ival"
|
||||
MemberName 15($Global) 1 "ival4"
|
||||
MemberName 15($Global) 2 "fval"
|
||||
MemberName 15($Global) 3 "fval4"
|
||||
Name 17 ""
|
||||
Name 50 "psout"
|
||||
Name 59 "Color"
|
||||
MemberDecorate 15($Global) 0 Offset 0
|
||||
MemberDecorate 15($Global) 1 Offset 16
|
||||
MemberDecorate 15($Global) 2 Offset 32
|
||||
MemberDecorate 15($Global) 3 Offset 48
|
||||
Decorate 15($Global) Block
|
||||
Decorate 17 DescriptorSet 0
|
||||
Decorate 59(Color) Location 0
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeBool
|
||||
7: TypeInt 32 1
|
||||
8: TypeVector 7(int) 4
|
||||
9: TypeFloat 32
|
||||
10: TypeVector 9(float) 4
|
||||
11($Global): TypeStruct 7(int) 8(ivec4) 9(float) 10(fvec4)
|
||||
12: TypePointer Uniform 11($Global)
|
||||
13: 12(ptr) Variable Uniform
|
||||
14: 7(int) Constant 0
|
||||
15: TypePointer Uniform 7(int)
|
||||
18: TypeInt 32 0
|
||||
19: 18(int) Constant 0
|
||||
23: 7(int) Constant 2
|
||||
24: TypePointer Uniform 9(float)
|
||||
45(PS_OUTPUT): TypeStruct 10(fvec4)
|
||||
46: TypePointer Function 45(PS_OUTPUT)
|
||||
48: 9(float) Constant 1065353216
|
||||
49: 10(fvec4) ConstantComposite 48 48 48 48
|
||||
50: TypePointer Function 10(fvec4)
|
||||
52: TypePointer Output 10(fvec4)
|
||||
53(Color): 52(ptr) Variable Output
|
||||
6: TypeFloat 32
|
||||
7: TypeVector 6(float) 4
|
||||
8(PS_OUTPUT): TypeStruct 7(fvec4)
|
||||
9: TypeFunction 8(PS_OUTPUT)
|
||||
12: TypeBool
|
||||
13: TypeInt 32 1
|
||||
14: TypeVector 13(int) 4
|
||||
15($Global): TypeStruct 13(int) 14(ivec4) 6(float) 7(fvec4)
|
||||
16: TypePointer Uniform 15($Global)
|
||||
17: 16(ptr) Variable Uniform
|
||||
18: 13(int) Constant 0
|
||||
19: TypePointer Uniform 13(int)
|
||||
22: TypeInt 32 0
|
||||
23: 22(int) Constant 0
|
||||
27: 13(int) Constant 2
|
||||
28: TypePointer Uniform 6(float)
|
||||
49: TypePointer Function 8(PS_OUTPUT)
|
||||
51: 6(float) Constant 1065353216
|
||||
52: 7(fvec4) ConstantComposite 51 51 51 51
|
||||
53: TypePointer Function 7(fvec4)
|
||||
58: TypePointer Output 7(fvec4)
|
||||
59(Color): 58(ptr) Variable Output
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
47(psout): 46(ptr) Variable Function
|
||||
16: 15(ptr) AccessChain 13 14
|
||||
17: 7(int) Load 16
|
||||
20: 6(bool) INotEqual 17 19
|
||||
SelectionMerge 22 None
|
||||
BranchConditional 20 21 22
|
||||
21: Label
|
||||
25: 24(ptr) AccessChain 13 23
|
||||
26: 9(float) Load 25
|
||||
27: 7(int) ConvertFToS 26
|
||||
28: 6(bool) INotEqual 27 19
|
||||
Branch 22
|
||||
22: Label
|
||||
29: 6(bool) Phi 20 5 28 21
|
||||
SelectionMerge 31 None
|
||||
BranchConditional 29 30 31
|
||||
30: Label
|
||||
Branch 31
|
||||
31: Label
|
||||
32: 15(ptr) AccessChain 13 14
|
||||
33: 7(int) Load 32
|
||||
34: 6(bool) INotEqual 33 19
|
||||
35: 6(bool) LogicalNot 34
|
||||
SelectionMerge 37 None
|
||||
BranchConditional 35 36 37
|
||||
36: Label
|
||||
38: 24(ptr) AccessChain 13 23
|
||||
39: 9(float) Load 38
|
||||
40: 7(int) ConvertFToS 39
|
||||
41: 6(bool) INotEqual 40 19
|
||||
Branch 37
|
||||
37: Label
|
||||
42: 6(bool) Phi 34 31 41 36
|
||||
SelectionMerge 44 None
|
||||
BranchConditional 42 43 44
|
||||
43: Label
|
||||
Branch 44
|
||||
44: Label
|
||||
51: 50(ptr) AccessChain 47(psout) 14
|
||||
Store 51 49
|
||||
54: 50(ptr) AccessChain 47(psout) 14
|
||||
55: 10(fvec4) Load 54
|
||||
Store 53(Color) 55
|
||||
60:8(PS_OUTPUT) FunctionCall 10(@main()
|
||||
61: 7(fvec4) CompositeExtract 60 0
|
||||
Store 59(Color) 61
|
||||
Return
|
||||
FunctionEnd
|
||||
10(@main():8(PS_OUTPUT) Function None 9
|
||||
11: Label
|
||||
50(psout): 49(ptr) Variable Function
|
||||
20: 19(ptr) AccessChain 17 18
|
||||
21: 13(int) Load 20
|
||||
24: 12(bool) INotEqual 21 23
|
||||
SelectionMerge 26 None
|
||||
BranchConditional 24 25 26
|
||||
25: Label
|
||||
29: 28(ptr) AccessChain 17 27
|
||||
30: 6(float) Load 29
|
||||
31: 13(int) ConvertFToS 30
|
||||
32: 12(bool) INotEqual 31 23
|
||||
Branch 26
|
||||
26: Label
|
||||
33: 12(bool) Phi 24 11 32 25
|
||||
SelectionMerge 35 None
|
||||
BranchConditional 33 34 35
|
||||
34: Label
|
||||
Branch 35
|
||||
35: Label
|
||||
36: 19(ptr) AccessChain 17 18
|
||||
37: 13(int) Load 36
|
||||
38: 12(bool) INotEqual 37 23
|
||||
39: 12(bool) LogicalNot 38
|
||||
SelectionMerge 41 None
|
||||
BranchConditional 39 40 41
|
||||
40: Label
|
||||
42: 28(ptr) AccessChain 17 27
|
||||
43: 6(float) Load 42
|
||||
44: 13(int) ConvertFToS 43
|
||||
45: 12(bool) INotEqual 44 23
|
||||
Branch 41
|
||||
41: Label
|
||||
46: 12(bool) Phi 38 35 45 40
|
||||
SelectionMerge 48 None
|
||||
BranchConditional 46 47 48
|
||||
47: Label
|
||||
Branch 48
|
||||
48: Label
|
||||
54: 53(ptr) AccessChain 50(psout) 18
|
||||
Store 54 52
|
||||
55:8(PS_OUTPUT) Load 50(psout)
|
||||
ReturnValue 55
|
||||
FunctionEnd
|
||||
|
||||
Reference in New Issue
Block a user