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.mintypes.frag
|
||||
Shader version: 450
|
||||
gl_FragCoord origin is upper left
|
||||
0:? Sequence
|
||||
0:9 Function Definition: main( (temp structure{temp 4-component vector of float Color})
|
||||
0:9 Function Definition: @main( (temp structure{temp 4-component vector of float Color})
|
||||
0:9 Function Parameters:
|
||||
0:? Sequence
|
||||
0:40 add (temp mediump 2-component vector of float)
|
||||
@@ -30,15 +30,18 @@ gl_FragCoord origin is upper left
|
||||
0:47 0.000000
|
||||
0:47 0.000000
|
||||
0:47 0.000000
|
||||
0:48 Sequence
|
||||
0:48 Sequence
|
||||
0:48 move second child to first child (temp 4-component vector of float)
|
||||
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
|
||||
0:48 Color: direct index for structure (temp 4-component vector of float)
|
||||
0:48 'psout' (temp structure{temp 4-component vector of float Color})
|
||||
0:48 Constant:
|
||||
0:48 0 (const int)
|
||||
0:48 Branch: Return
|
||||
0:48 Branch: Return with expression
|
||||
0:48 'psout' (temp structure{temp 4-component vector of float Color})
|
||||
0:9 Function Definition: main( (temp void)
|
||||
0:9 Function Parameters:
|
||||
0:? Sequence
|
||||
0:9 Sequence
|
||||
0:9 move second child to first child (temp 4-component vector of float)
|
||||
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
|
||||
0:9 Color: direct index for structure (temp 4-component vector of float)
|
||||
0:9 Function Call: @main( (temp structure{temp 4-component vector of float Color})
|
||||
0:9 Constant:
|
||||
0:9 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 mediump float b1a, layout(offset=4 ) uniform mediump float b1b})
|
||||
@@ -50,7 +53,7 @@ Linked fragment stage:
|
||||
Shader version: 450
|
||||
gl_FragCoord origin is upper left
|
||||
0:? Sequence
|
||||
0:9 Function Definition: main( (temp structure{temp 4-component vector of float Color})
|
||||
0:9 Function Definition: @main( (temp structure{temp 4-component vector of float Color})
|
||||
0:9 Function Parameters:
|
||||
0:? Sequence
|
||||
0:40 add (temp mediump 2-component vector of float)
|
||||
@@ -78,147 +81,157 @@ gl_FragCoord origin is upper left
|
||||
0:47 0.000000
|
||||
0:47 0.000000
|
||||
0:47 0.000000
|
||||
0:48 Sequence
|
||||
0:48 Sequence
|
||||
0:48 move second child to first child (temp 4-component vector of float)
|
||||
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
|
||||
0:48 Color: direct index for structure (temp 4-component vector of float)
|
||||
0:48 'psout' (temp structure{temp 4-component vector of float Color})
|
||||
0:48 Constant:
|
||||
0:48 0 (const int)
|
||||
0:48 Branch: Return
|
||||
0:48 Branch: Return with expression
|
||||
0:48 'psout' (temp structure{temp 4-component vector of float Color})
|
||||
0:9 Function Definition: main( (temp void)
|
||||
0:9 Function Parameters:
|
||||
0:? Sequence
|
||||
0:9 Sequence
|
||||
0:9 move second child to first child (temp 4-component vector of float)
|
||||
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
|
||||
0:9 Color: direct index for structure (temp 4-component vector of float)
|
||||
0:9 Function Call: @main( (temp structure{temp 4-component vector of float Color})
|
||||
0:9 Constant:
|
||||
0:9 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 mediump float b1a, layout(offset=4 ) uniform mediump float b1b})
|
||||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80001
|
||||
// Id's are bound by 65
|
||||
// Id's are bound by 70
|
||||
|
||||
Capability Shader
|
||||
1: ExtInstImport "GLSL.std.450"
|
||||
MemoryModel Logical GLSL450
|
||||
EntryPoint Fragment 4 "main" 58
|
||||
EntryPoint Fragment 4 "main" 64
|
||||
ExecutionMode 4 OriginUpperLeft
|
||||
Name 4 "main"
|
||||
Name 9 "mf16_2"
|
||||
Name 12 "mf16"
|
||||
Name 16 "mf10_2"
|
||||
Name 18 "mf10"
|
||||
Name 25 "mi16_2"
|
||||
Name 28 "mi16"
|
||||
Name 32 "mi12_2"
|
||||
Name 34 "mi12"
|
||||
Name 41 "mu16_2"
|
||||
Name 44 "mu16"
|
||||
Name 49 "PS_OUTPUT"
|
||||
MemberName 49(PS_OUTPUT) 0 "Color"
|
||||
Name 51 "psout"
|
||||
Name 58 "Color"
|
||||
Name 62 "$Global"
|
||||
MemberName 62($Global) 0 "b1a"
|
||||
MemberName 62($Global) 1 "b1b"
|
||||
Name 64 ""
|
||||
Decorate 9(mf16_2) RelaxedPrecision
|
||||
Decorate 10 RelaxedPrecision
|
||||
Decorate 12(mf16) RelaxedPrecision
|
||||
Decorate 13 RelaxedPrecision
|
||||
Decorate 14 RelaxedPrecision
|
||||
Name 8 "PS_OUTPUT"
|
||||
MemberName 8(PS_OUTPUT) 0 "Color"
|
||||
Name 10 "@main("
|
||||
Name 14 "mf16_2"
|
||||
Name 17 "mf16"
|
||||
Name 21 "mf10_2"
|
||||
Name 23 "mf10"
|
||||
Name 30 "mi16_2"
|
||||
Name 33 "mi16"
|
||||
Name 37 "mi12_2"
|
||||
Name 39 "mi12"
|
||||
Name 46 "mu16_2"
|
||||
Name 49 "mu16"
|
||||
Name 54 "psout"
|
||||
Name 64 "Color"
|
||||
Name 67 "$Global"
|
||||
MemberName 67($Global) 0 "b1a"
|
||||
MemberName 67($Global) 1 "b1b"
|
||||
Name 69 ""
|
||||
Decorate 14(mf16_2) RelaxedPrecision
|
||||
Decorate 15 RelaxedPrecision
|
||||
Decorate 16(mf10_2) RelaxedPrecision
|
||||
Decorate 17 RelaxedPrecision
|
||||
Decorate 18(mf10) RelaxedPrecision
|
||||
Decorate 17(mf16) RelaxedPrecision
|
||||
Decorate 18 RelaxedPrecision
|
||||
Decorate 19 RelaxedPrecision
|
||||
Decorate 20 RelaxedPrecision
|
||||
Decorate 21 RelaxedPrecision
|
||||
Decorate 25(mi16_2) RelaxedPrecision
|
||||
Decorate 21(mf10_2) RelaxedPrecision
|
||||
Decorate 22 RelaxedPrecision
|
||||
Decorate 23(mf10) RelaxedPrecision
|
||||
Decorate 24 RelaxedPrecision
|
||||
Decorate 25 RelaxedPrecision
|
||||
Decorate 26 RelaxedPrecision
|
||||
Decorate 28(mi16) RelaxedPrecision
|
||||
Decorate 29 RelaxedPrecision
|
||||
Decorate 30 RelaxedPrecision
|
||||
Decorate 30(mi16_2) RelaxedPrecision
|
||||
Decorate 31 RelaxedPrecision
|
||||
Decorate 32(mi12_2) RelaxedPrecision
|
||||
Decorate 33 RelaxedPrecision
|
||||
Decorate 34(mi12) RelaxedPrecision
|
||||
Decorate 33(mi16) RelaxedPrecision
|
||||
Decorate 34 RelaxedPrecision
|
||||
Decorate 35 RelaxedPrecision
|
||||
Decorate 36 RelaxedPrecision
|
||||
Decorate 37 RelaxedPrecision
|
||||
Decorate 41(mu16_2) RelaxedPrecision
|
||||
Decorate 37(mi12_2) RelaxedPrecision
|
||||
Decorate 38 RelaxedPrecision
|
||||
Decorate 39(mi12) RelaxedPrecision
|
||||
Decorate 40 RelaxedPrecision
|
||||
Decorate 41 RelaxedPrecision
|
||||
Decorate 42 RelaxedPrecision
|
||||
Decorate 44(mu16) RelaxedPrecision
|
||||
Decorate 45 RelaxedPrecision
|
||||
Decorate 46 RelaxedPrecision
|
||||
Decorate 46(mu16_2) RelaxedPrecision
|
||||
Decorate 47 RelaxedPrecision
|
||||
Decorate 58(Color) Location 0
|
||||
MemberDecorate 62($Global) 0 RelaxedPrecision
|
||||
MemberDecorate 62($Global) 0 Offset 0
|
||||
MemberDecorate 62($Global) 1 RelaxedPrecision
|
||||
MemberDecorate 62($Global) 1 Offset 4
|
||||
Decorate 62($Global) Block
|
||||
Decorate 64 DescriptorSet 0
|
||||
Decorate 49(mu16) RelaxedPrecision
|
||||
Decorate 50 RelaxedPrecision
|
||||
Decorate 51 RelaxedPrecision
|
||||
Decorate 52 RelaxedPrecision
|
||||
Decorate 64(Color) Location 0
|
||||
MemberDecorate 67($Global) 0 RelaxedPrecision
|
||||
MemberDecorate 67($Global) 0 Offset 0
|
||||
MemberDecorate 67($Global) 1 RelaxedPrecision
|
||||
MemberDecorate 67($Global) 1 Offset 4
|
||||
Decorate 67($Global) Block
|
||||
Decorate 69 DescriptorSet 0
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeFloat 32
|
||||
7: TypeVector 6(float) 2
|
||||
8: TypePointer Function 7(fvec2)
|
||||
11: TypePointer Function 6(float)
|
||||
22: TypeInt 32 1
|
||||
23: TypeVector 22(int) 2
|
||||
24: TypePointer Function 23(ivec2)
|
||||
27: TypePointer Function 22(int)
|
||||
38: TypeInt 32 0
|
||||
39: TypeVector 38(int) 2
|
||||
40: TypePointer Function 39(ivec2)
|
||||
43: TypePointer Function 38(int)
|
||||
48: TypeVector 6(float) 4
|
||||
49(PS_OUTPUT): TypeStruct 48(fvec4)
|
||||
50: TypePointer Function 49(PS_OUTPUT)
|
||||
52: 22(int) Constant 0
|
||||
53: 6(float) Constant 0
|
||||
54: 48(fvec4) ConstantComposite 53 53 53 53
|
||||
55: TypePointer Function 48(fvec4)
|
||||
57: TypePointer Output 48(fvec4)
|
||||
58(Color): 57(ptr) Variable Output
|
||||
62($Global): TypeStruct 6(float) 6(float)
|
||||
63: TypePointer Uniform 62($Global)
|
||||
64: 63(ptr) Variable Uniform
|
||||
7: TypeVector 6(float) 4
|
||||
8(PS_OUTPUT): TypeStruct 7(fvec4)
|
||||
9: TypeFunction 8(PS_OUTPUT)
|
||||
12: TypeVector 6(float) 2
|
||||
13: TypePointer Function 12(fvec2)
|
||||
16: TypePointer Function 6(float)
|
||||
27: TypeInt 32 1
|
||||
28: TypeVector 27(int) 2
|
||||
29: TypePointer Function 28(ivec2)
|
||||
32: TypePointer Function 27(int)
|
||||
43: TypeInt 32 0
|
||||
44: TypeVector 43(int) 2
|
||||
45: TypePointer Function 44(ivec2)
|
||||
48: TypePointer Function 43(int)
|
||||
53: TypePointer Function 8(PS_OUTPUT)
|
||||
55: 27(int) Constant 0
|
||||
56: 6(float) Constant 0
|
||||
57: 7(fvec4) ConstantComposite 56 56 56 56
|
||||
58: TypePointer Function 7(fvec4)
|
||||
63: TypePointer Output 7(fvec4)
|
||||
64(Color): 63(ptr) Variable Output
|
||||
67($Global): TypeStruct 6(float) 6(float)
|
||||
68: TypePointer Uniform 67($Global)
|
||||
69: 68(ptr) Variable Uniform
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
9(mf16_2): 8(ptr) Variable Function
|
||||
12(mf16): 11(ptr) Variable Function
|
||||
16(mf10_2): 8(ptr) Variable Function
|
||||
18(mf10): 11(ptr) Variable Function
|
||||
25(mi16_2): 24(ptr) Variable Function
|
||||
28(mi16): 27(ptr) Variable Function
|
||||
32(mi12_2): 24(ptr) Variable Function
|
||||
34(mi12): 27(ptr) Variable Function
|
||||
41(mu16_2): 40(ptr) Variable Function
|
||||
44(mu16): 43(ptr) Variable Function
|
||||
51(psout): 50(ptr) Variable Function
|
||||
10: 7(fvec2) Load 9(mf16_2)
|
||||
13: 6(float) Load 12(mf16)
|
||||
14: 7(fvec2) CompositeConstruct 13 13
|
||||
15: 7(fvec2) FAdd 10 14
|
||||
17: 7(fvec2) Load 16(mf10_2)
|
||||
19: 6(float) Load 18(mf10)
|
||||
20: 7(fvec2) CompositeConstruct 19 19
|
||||
21: 7(fvec2) FAdd 17 20
|
||||
26: 23(ivec2) Load 25(mi16_2)
|
||||
29: 22(int) Load 28(mi16)
|
||||
30: 23(ivec2) CompositeConstruct 29 29
|
||||
31: 23(ivec2) IAdd 26 30
|
||||
33: 23(ivec2) Load 32(mi12_2)
|
||||
35: 22(int) Load 34(mi12)
|
||||
36: 23(ivec2) CompositeConstruct 35 35
|
||||
37: 23(ivec2) IAdd 33 36
|
||||
42: 39(ivec2) Load 41(mu16_2)
|
||||
45: 38(int) Load 44(mu16)
|
||||
46: 39(ivec2) CompositeConstruct 45 45
|
||||
47: 39(ivec2) IAdd 42 46
|
||||
56: 55(ptr) AccessChain 51(psout) 52
|
||||
Store 56 54
|
||||
59: 55(ptr) AccessChain 51(psout) 52
|
||||
60: 48(fvec4) Load 59
|
||||
Store 58(Color) 60
|
||||
65:8(PS_OUTPUT) FunctionCall 10(@main()
|
||||
66: 7(fvec4) CompositeExtract 65 0
|
||||
Store 64(Color) 66
|
||||
Return
|
||||
FunctionEnd
|
||||
10(@main():8(PS_OUTPUT) Function None 9
|
||||
11: Label
|
||||
14(mf16_2): 13(ptr) Variable Function
|
||||
17(mf16): 16(ptr) Variable Function
|
||||
21(mf10_2): 13(ptr) Variable Function
|
||||
23(mf10): 16(ptr) Variable Function
|
||||
30(mi16_2): 29(ptr) Variable Function
|
||||
33(mi16): 32(ptr) Variable Function
|
||||
37(mi12_2): 29(ptr) Variable Function
|
||||
39(mi12): 32(ptr) Variable Function
|
||||
46(mu16_2): 45(ptr) Variable Function
|
||||
49(mu16): 48(ptr) Variable Function
|
||||
54(psout): 53(ptr) Variable Function
|
||||
15: 12(fvec2) Load 14(mf16_2)
|
||||
18: 6(float) Load 17(mf16)
|
||||
19: 12(fvec2) CompositeConstruct 18 18
|
||||
20: 12(fvec2) FAdd 15 19
|
||||
22: 12(fvec2) Load 21(mf10_2)
|
||||
24: 6(float) Load 23(mf10)
|
||||
25: 12(fvec2) CompositeConstruct 24 24
|
||||
26: 12(fvec2) FAdd 22 25
|
||||
31: 28(ivec2) Load 30(mi16_2)
|
||||
34: 27(int) Load 33(mi16)
|
||||
35: 28(ivec2) CompositeConstruct 34 34
|
||||
36: 28(ivec2) IAdd 31 35
|
||||
38: 28(ivec2) Load 37(mi12_2)
|
||||
40: 27(int) Load 39(mi12)
|
||||
41: 28(ivec2) CompositeConstruct 40 40
|
||||
42: 28(ivec2) IAdd 38 41
|
||||
47: 44(ivec2) Load 46(mu16_2)
|
||||
50: 43(int) Load 49(mu16)
|
||||
51: 44(ivec2) CompositeConstruct 50 50
|
||||
52: 44(ivec2) IAdd 47 51
|
||||
59: 58(ptr) AccessChain 54(psout) 55
|
||||
Store 59 57
|
||||
60:8(PS_OUTPUT) Load 54(psout)
|
||||
ReturnValue 60
|
||||
FunctionEnd
|
||||
|
||||
Reference in New Issue
Block a user