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
2017-01-19 15:41:47 -07:00
parent 18adbdbbb8
commit 02467d8d94
171 changed files with 37604 additions and 32679 deletions

View File

@@ -2,7 +2,7 @@ hlsl.sample.array.dx10.frag
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:24 Function Definition: main( (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 Function Definition: @main( (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 Function Parameters:
0:? Sequence
0:27 Sequence
@@ -121,24 +121,28 @@ gl_FragCoord origin is upper left
0:40 1 (const int)
0:40 Constant:
0:40 1.000000
0:42 Sequence
0:42 Sequence
0:42 move second child to first child (temp 4-component vector of float)
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
0:42 Color: direct index for structure (temp 4-component vector of float)
0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float Depth})
0:42 Constant:
0:42 0 (const int)
0:42 move second child to first child (temp float)
0:? 'Depth' (out float FragDepth)
0:42 Depth: direct index for structure (temp float)
0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float Depth})
0:42 Constant:
0:42 1 (const int)
0:42 Branch: Return
0:42 Branch: Return with expression
0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 Function Definition: main( (temp void)
0:24 Function Parameters:
0:? Sequence
0:24 Sequence
0:24 move second child to first child (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 'flattenTemp' (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 Function Call: @main( (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 move second child to first child (temp 4-component vector of float)
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
0:24 Color: direct index for structure (temp 4-component vector of float)
0:24 'flattenTemp' (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 Constant:
0:24 0 (const int)
0:24 move second child to first child (temp float)
0:? 'Depth' (out float FragDepth)
0:24 Depth: direct index for structure (temp float)
0:24 'flattenTemp' (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 Constant:
0:24 1 (const int)
0:? Linker Objects
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
0:? 'Depth' (out float FragDepth)
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray)
0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray)
@@ -150,6 +154,8 @@ gl_FragCoord origin is upper left
0:? 'g_tTexcdf4' (uniform textureCubeArray)
0:? 'g_tTexcdi4' (uniform itextureCubeArray)
0:? 'g_tTexcdu4' (uniform utextureCubeArray)
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
0:? 'Depth' (out float FragDepth)
Linked fragment stage:
@@ -158,7 +164,7 @@ Linked fragment stage:
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:24 Function Definition: main( (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 Function Definition: @main( (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 Function Parameters:
0:? Sequence
0:27 Sequence
@@ -277,24 +283,28 @@ gl_FragCoord origin is upper left
0:40 1 (const int)
0:40 Constant:
0:40 1.000000
0:42 Sequence
0:42 Sequence
0:42 move second child to first child (temp 4-component vector of float)
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
0:42 Color: direct index for structure (temp 4-component vector of float)
0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float Depth})
0:42 Constant:
0:42 0 (const int)
0:42 move second child to first child (temp float)
0:? 'Depth' (out float FragDepth)
0:42 Depth: direct index for structure (temp float)
0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float Depth})
0:42 Constant:
0:42 1 (const int)
0:42 Branch: Return
0:42 Branch: Return with expression
0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 Function Definition: main( (temp void)
0:24 Function Parameters:
0:? Sequence
0:24 Sequence
0:24 move second child to first child (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 'flattenTemp' (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 Function Call: @main( (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 move second child to first child (temp 4-component vector of float)
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
0:24 Color: direct index for structure (temp 4-component vector of float)
0:24 'flattenTemp' (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 Constant:
0:24 0 (const int)
0:24 move second child to first child (temp float)
0:? 'Depth' (out float FragDepth)
0:24 Depth: direct index for structure (temp float)
0:24 'flattenTemp' (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 Constant:
0:24 1 (const int)
0:? Linker Objects
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
0:? 'Depth' (out float FragDepth)
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray)
0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray)
@@ -306,209 +316,222 @@ gl_FragCoord origin is upper left
0:? 'g_tTexcdf4' (uniform textureCubeArray)
0:? 'g_tTexcdi4' (uniform itextureCubeArray)
0:? 'g_tTexcdu4' (uniform utextureCubeArray)
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
0:? 'Depth' (out float FragDepth)
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 139
// Id's are bound by 146
Capability Shader
Capability Sampled1D
Capability SampledCubeArray
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 130 134
EntryPoint Fragment 4 "main" 138 142
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 9 "txval10"
Name 12 "g_tTex1df4"
Name 16 "g_sSamp"
Name 28 "txval11"
Name 31 "g_tTex1di4"
Name 42 "txval12"
Name 45 "g_tTex1du4"
Name 53 "txval20"
Name 56 "g_tTex2df4"
Name 64 "txval21"
Name 67 "g_tTex2di4"
Name 75 "txval22"
Name 78 "g_tTex2du4"
Name 87 "txval40"
Name 90 "g_tTexcdf4"
Name 97 "txval41"
Name 100 "g_tTexcdi4"
Name 107 "txval42"
Name 110 "g_tTexcdu4"
Name 120 "PS_OUTPUT"
MemberName 120(PS_OUTPUT) 0 "Color"
MemberName 120(PS_OUTPUT) 1 "Depth"
Name 122 "psout"
Name 130 "Color"
Name 134 "Depth"
Name 138 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0
Decorate 16(g_sSamp) Binding 0
Decorate 31(g_tTex1di4) DescriptorSet 0
Decorate 45(g_tTex1du4) DescriptorSet 0
Decorate 56(g_tTex2df4) DescriptorSet 0
Decorate 67(g_tTex2di4) DescriptorSet 0
Decorate 78(g_tTex2du4) DescriptorSet 0
Decorate 90(g_tTexcdf4) DescriptorSet 0
Decorate 100(g_tTexcdi4) DescriptorSet 0
Decorate 110(g_tTexcdu4) DescriptorSet 0
Decorate 130(Color) Location 0
Decorate 134(Depth) BuiltIn FragDepth
Decorate 138(g_tTex1df4a) DescriptorSet 0
Decorate 138(g_tTex1df4a) Binding 1
Name 8 "PS_OUTPUT"
MemberName 8(PS_OUTPUT) 0 "Color"
MemberName 8(PS_OUTPUT) 1 "Depth"
Name 10 "@main("
Name 13 "txval10"
Name 16 "g_tTex1df4"
Name 20 "g_sSamp"
Name 32 "txval11"
Name 35 "g_tTex1di4"
Name 46 "txval12"
Name 49 "g_tTex1du4"
Name 57 "txval20"
Name 60 "g_tTex2df4"
Name 68 "txval21"
Name 71 "g_tTex2di4"
Name 79 "txval22"
Name 82 "g_tTex2du4"
Name 91 "txval40"
Name 94 "g_tTexcdf4"
Name 101 "txval41"
Name 104 "g_tTexcdi4"
Name 111 "txval42"
Name 114 "g_tTexcdu4"
Name 125 "psout"
Name 135 "flattenTemp"
Name 138 "Color"
Name 142 "Depth"
Name 145 "g_tTex1df4a"
Decorate 16(g_tTex1df4) DescriptorSet 0
Decorate 16(g_tTex1df4) Binding 0
Decorate 20(g_sSamp) DescriptorSet 0
Decorate 20(g_sSamp) Binding 0
Decorate 35(g_tTex1di4) DescriptorSet 0
Decorate 49(g_tTex1du4) DescriptorSet 0
Decorate 60(g_tTex2df4) DescriptorSet 0
Decorate 71(g_tTex2di4) DescriptorSet 0
Decorate 82(g_tTex2du4) DescriptorSet 0
Decorate 94(g_tTexcdf4) DescriptorSet 0
Decorate 104(g_tTexcdi4) DescriptorSet 0
Decorate 114(g_tTexcdu4) DescriptorSet 0
Decorate 138(Color) Location 0
Decorate 142(Depth) BuiltIn FragDepth
Decorate 145(g_tTex1df4a) DescriptorSet 0
Decorate 145(g_tTex1df4a) Binding 1
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
7: TypeVector 6(float) 4
8: TypePointer Function 7(fvec4)
10: TypeImage 6(float) 1D array sampled format:Unknown
11: TypePointer UniformConstant 10
12(g_tTex1df4): 11(ptr) Variable UniformConstant
14: TypeSampler
8(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
9: TypeFunction 8(PS_OUTPUT)
12: TypePointer Function 7(fvec4)
14: TypeImage 6(float) 1D array sampled format:Unknown
15: TypePointer UniformConstant 14
16(g_sSamp): 15(ptr) Variable UniformConstant
18: TypeSampledImage 10
20: TypeVector 6(float) 2
21: 6(float) Constant 1036831949
22: 6(float) Constant 1045220557
23: 20(fvec2) ConstantComposite 21 22
25: TypeInt 32 1
26: TypeVector 25(int) 4
27: TypePointer Function 26(ivec4)
29: TypeImage 25(int) 1D array sampled format:Unknown
30: TypePointer UniformConstant 29
31(g_tTex1di4): 30(ptr) Variable UniformConstant
34: TypeSampledImage 29
36: 6(float) Constant 1050253722
37: 20(fvec2) ConstantComposite 22 36
39: TypeInt 32 0
40: TypeVector 39(int) 4
41: TypePointer Function 40(ivec4)
43: TypeImage 39(int) 1D array sampled format:Unknown
44: TypePointer UniformConstant 43
45(g_tTex1du4): 44(ptr) Variable UniformConstant
48: TypeSampledImage 43
50: 6(float) Constant 1053609165
51: 20(fvec2) ConstantComposite 36 50
54: TypeImage 6(float) 2D array sampled format:Unknown
55: TypePointer UniformConstant 54
56(g_tTex2df4): 55(ptr) Variable UniformConstant
59: TypeSampledImage 54
61: TypeVector 6(float) 3
62: 61(fvec3) ConstantComposite 21 22 36
65: TypeImage 25(int) 2D array sampled format:Unknown
66: TypePointer UniformConstant 65
67(g_tTex2di4): 66(ptr) Variable UniformConstant
70: TypeSampledImage 65
72: 6(float) Constant 1056964608
73: 61(fvec3) ConstantComposite 36 50 72
76: TypeImage 39(int) 2D array sampled format:Unknown
77: TypePointer UniformConstant 76
78(g_tTex2du4): 77(ptr) Variable UniformConstant
81: TypeSampledImage 76
83: 6(float) Constant 1058642330
84: 6(float) Constant 1060320051
85: 61(fvec3) ConstantComposite 72 83 84
88: TypeImage 6(float) Cube array sampled format:Unknown
89: TypePointer UniformConstant 88
90(g_tTexcdf4): 89(ptr) Variable UniformConstant
93: TypeSampledImage 88
95: 7(fvec4) ConstantComposite 21 22 36 50
98: TypeImage 25(int) Cube array sampled format:Unknown
99: TypePointer UniformConstant 98
100(g_tTexcdi4): 99(ptr) Variable UniformConstant
103: TypeSampledImage 98
105: 7(fvec4) ConstantComposite 50 72 83 84
108: TypeImage 39(int) Cube array sampled format:Unknown
109: TypePointer UniformConstant 108
110(g_tTexcdu4): 109(ptr) Variable UniformConstant
113: TypeSampledImage 108
115: 6(float) Constant 1061997773
116: 6(float) Constant 1063675494
117: 6(float) Constant 1065353216
118: 7(fvec4) ConstantComposite 84 115 116 117
120(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
121: TypePointer Function 120(PS_OUTPUT)
123: 25(int) Constant 0
124: 7(fvec4) ConstantComposite 117 117 117 117
126: 25(int) Constant 1
127: TypePointer Function 6(float)
129: TypePointer Output 7(fvec4)
130(Color): 129(ptr) Variable Output
133: TypePointer Output 6(float)
134(Depth): 133(ptr) Variable Output
138(g_tTex1df4a): 11(ptr) Variable UniformConstant
16(g_tTex1df4): 15(ptr) Variable UniformConstant
18: TypeSampler
19: TypePointer UniformConstant 18
20(g_sSamp): 19(ptr) Variable UniformConstant
22: TypeSampledImage 14
24: TypeVector 6(float) 2
25: 6(float) Constant 1036831949
26: 6(float) Constant 1045220557
27: 24(fvec2) ConstantComposite 25 26
29: TypeInt 32 1
30: TypeVector 29(int) 4
31: TypePointer Function 30(ivec4)
33: TypeImage 29(int) 1D array sampled format:Unknown
34: TypePointer UniformConstant 33
35(g_tTex1di4): 34(ptr) Variable UniformConstant
38: TypeSampledImage 33
40: 6(float) Constant 1050253722
41: 24(fvec2) ConstantComposite 26 40
43: TypeInt 32 0
44: TypeVector 43(int) 4
45: TypePointer Function 44(ivec4)
47: TypeImage 43(int) 1D array sampled format:Unknown
48: TypePointer UniformConstant 47
49(g_tTex1du4): 48(ptr) Variable UniformConstant
52: TypeSampledImage 47
54: 6(float) Constant 1053609165
55: 24(fvec2) ConstantComposite 40 54
58: TypeImage 6(float) 2D array sampled format:Unknown
59: TypePointer UniformConstant 58
60(g_tTex2df4): 59(ptr) Variable UniformConstant
63: TypeSampledImage 58
65: TypeVector 6(float) 3
66: 65(fvec3) ConstantComposite 25 26 40
69: TypeImage 29(int) 2D array sampled format:Unknown
70: TypePointer UniformConstant 69
71(g_tTex2di4): 70(ptr) Variable UniformConstant
74: TypeSampledImage 69
76: 6(float) Constant 1056964608
77: 65(fvec3) ConstantComposite 40 54 76
80: TypeImage 43(int) 2D array sampled format:Unknown
81: TypePointer UniformConstant 80
82(g_tTex2du4): 81(ptr) Variable UniformConstant
85: TypeSampledImage 80
87: 6(float) Constant 1058642330
88: 6(float) Constant 1060320051
89: 65(fvec3) ConstantComposite 76 87 88
92: TypeImage 6(float) Cube array sampled format:Unknown
93: TypePointer UniformConstant 92
94(g_tTexcdf4): 93(ptr) Variable UniformConstant
97: TypeSampledImage 92
99: 7(fvec4) ConstantComposite 25 26 40 54
102: TypeImage 29(int) Cube array sampled format:Unknown
103: TypePointer UniformConstant 102
104(g_tTexcdi4): 103(ptr) Variable UniformConstant
107: TypeSampledImage 102
109: 7(fvec4) ConstantComposite 54 76 87 88
112: TypeImage 43(int) Cube array sampled format:Unknown
113: TypePointer UniformConstant 112
114(g_tTexcdu4): 113(ptr) Variable UniformConstant
117: TypeSampledImage 112
119: 6(float) Constant 1061997773
120: 6(float) Constant 1063675494
121: 6(float) Constant 1065353216
122: 7(fvec4) ConstantComposite 88 119 120 121
124: TypePointer Function 8(PS_OUTPUT)
126: 29(int) Constant 0
127: 7(fvec4) ConstantComposite 121 121 121 121
129: 29(int) Constant 1
130: TypePointer Function 6(float)
137: TypePointer Output 7(fvec4)
138(Color): 137(ptr) Variable Output
141: TypePointer Output 6(float)
142(Depth): 141(ptr) Variable Output
145(g_tTex1df4a): 15(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function
28(txval11): 27(ptr) Variable Function
42(txval12): 41(ptr) Variable Function
53(txval20): 8(ptr) Variable Function
64(txval21): 27(ptr) Variable Function
75(txval22): 41(ptr) Variable Function
87(txval40): 8(ptr) Variable Function
97(txval41): 27(ptr) Variable Function
107(txval42): 41(ptr) Variable Function
122(psout): 121(ptr) Variable Function
13: 10 Load 12(g_tTex1df4)
17: 14 Load 16(g_sSamp)
19: 18 SampledImage 13 17
24: 7(fvec4) ImageSampleImplicitLod 19 23
Store 9(txval10) 24
32: 29 Load 31(g_tTex1di4)
33: 14 Load 16(g_sSamp)
35: 34 SampledImage 32 33
38: 26(ivec4) ImageSampleImplicitLod 35 37
Store 28(txval11) 38
46: 43 Load 45(g_tTex1du4)
47: 14 Load 16(g_sSamp)
49: 48 SampledImage 46 47
52: 40(ivec4) ImageSampleImplicitLod 49 51
Store 42(txval12) 52
57: 54 Load 56(g_tTex2df4)
58: 14 Load 16(g_sSamp)
60: 59 SampledImage 57 58
63: 7(fvec4) ImageSampleImplicitLod 60 62
Store 53(txval20) 63
68: 65 Load 67(g_tTex2di4)
69: 14 Load 16(g_sSamp)
71: 70 SampledImage 68 69
74: 26(ivec4) ImageSampleImplicitLod 71 73
Store 64(txval21) 74
79: 76 Load 78(g_tTex2du4)
80: 14 Load 16(g_sSamp)
82: 81 SampledImage 79 80
86: 40(ivec4) ImageSampleImplicitLod 82 85
Store 75(txval22) 86
91: 88 Load 90(g_tTexcdf4)
92: 14 Load 16(g_sSamp)
94: 93 SampledImage 91 92
96: 7(fvec4) ImageSampleImplicitLod 94 95
Store 87(txval40) 96
101: 98 Load 100(g_tTexcdi4)
102: 14 Load 16(g_sSamp)
104: 103 SampledImage 101 102
106: 26(ivec4) ImageSampleImplicitLod 104 105
Store 97(txval41) 106
111: 108 Load 110(g_tTexcdu4)
112: 14 Load 16(g_sSamp)
114: 113 SampledImage 111 112
119: 40(ivec4) ImageSampleImplicitLod 114 118
Store 107(txval42) 119
125: 8(ptr) AccessChain 122(psout) 123
Store 125 124
128: 127(ptr) AccessChain 122(psout) 126
Store 128 117
131: 8(ptr) AccessChain 122(psout) 123
132: 7(fvec4) Load 131
Store 130(Color) 132
135: 127(ptr) AccessChain 122(psout) 126
136: 6(float) Load 135
Store 134(Depth) 136
135(flattenTemp): 124(ptr) Variable Function
136:8(PS_OUTPUT) FunctionCall 10(@main()
Store 135(flattenTemp) 136
139: 12(ptr) AccessChain 135(flattenTemp) 126
140: 7(fvec4) Load 139
Store 138(Color) 140
143: 130(ptr) AccessChain 135(flattenTemp) 129
144: 6(float) Load 143
Store 142(Depth) 144
Return
FunctionEnd
10(@main():8(PS_OUTPUT) Function None 9
11: Label
13(txval10): 12(ptr) Variable Function
32(txval11): 31(ptr) Variable Function
46(txval12): 45(ptr) Variable Function
57(txval20): 12(ptr) Variable Function
68(txval21): 31(ptr) Variable Function
79(txval22): 45(ptr) Variable Function
91(txval40): 12(ptr) Variable Function
101(txval41): 31(ptr) Variable Function
111(txval42): 45(ptr) Variable Function
125(psout): 124(ptr) Variable Function
17: 14 Load 16(g_tTex1df4)
21: 18 Load 20(g_sSamp)
23: 22 SampledImage 17 21
28: 7(fvec4) ImageSampleImplicitLod 23 27
Store 13(txval10) 28
36: 33 Load 35(g_tTex1di4)
37: 18 Load 20(g_sSamp)
39: 38 SampledImage 36 37
42: 30(ivec4) ImageSampleImplicitLod 39 41
Store 32(txval11) 42
50: 47 Load 49(g_tTex1du4)
51: 18 Load 20(g_sSamp)
53: 52 SampledImage 50 51
56: 44(ivec4) ImageSampleImplicitLod 53 55
Store 46(txval12) 56
61: 58 Load 60(g_tTex2df4)
62: 18 Load 20(g_sSamp)
64: 63 SampledImage 61 62
67: 7(fvec4) ImageSampleImplicitLod 64 66
Store 57(txval20) 67
72: 69 Load 71(g_tTex2di4)
73: 18 Load 20(g_sSamp)
75: 74 SampledImage 72 73
78: 30(ivec4) ImageSampleImplicitLod 75 77
Store 68(txval21) 78
83: 80 Load 82(g_tTex2du4)
84: 18 Load 20(g_sSamp)
86: 85 SampledImage 83 84
90: 44(ivec4) ImageSampleImplicitLod 86 89
Store 79(txval22) 90
95: 92 Load 94(g_tTexcdf4)
96: 18 Load 20(g_sSamp)
98: 97 SampledImage 95 96
100: 7(fvec4) ImageSampleImplicitLod 98 99
Store 91(txval40) 100
105: 102 Load 104(g_tTexcdi4)
106: 18 Load 20(g_sSamp)
108: 107 SampledImage 105 106
110: 30(ivec4) ImageSampleImplicitLod 108 109
Store 101(txval41) 110
115: 112 Load 114(g_tTexcdu4)
116: 18 Load 20(g_sSamp)
118: 117 SampledImage 115 116
123: 44(ivec4) ImageSampleImplicitLod 118 122
Store 111(txval42) 123
128: 12(ptr) AccessChain 125(psout) 126
Store 128 127
131: 130(ptr) AccessChain 125(psout) 129
Store 131 121
132:8(PS_OUTPUT) Load 125(psout)
ReturnValue 132
FunctionEnd