HLSL: Start location numbering with the entry-point return value.

Also, increment location numbers by the size of the objects.
This commit is contained in:
John Kessenich 2016-08-29 18:10:47 -06:00
parent a05d8b5604
commit 830b0cc98b
89 changed files with 2517 additions and 2157 deletions

View file

@ -159,7 +159,7 @@ gl_FragCoord origin is upper left
0:58 1.000000
0:60 Sequence
0:60 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:60 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:60 Branch: Return
0:? Linker Objects
@ -350,7 +350,7 @@ gl_FragCoord origin is upper left
0:58 1.000000
0:60 Sequence
0:60 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:60 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:60 Branch: Return
0:? Linker Objects
@ -379,14 +379,14 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 178
// Id's are bound by 179
Capability Shader
Capability Sampled1D
Capability SampledCubeArray
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 139
EntryPoint Fragment 4 "main" 140
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 8 "r00"
@ -412,19 +412,22 @@ gl_FragCoord origin is upper left
MemberName 128(PS_OUTPUT) 0 "Color"
MemberName 128(PS_OUTPUT) 1 "Depth"
Name 130 "psout"
Name 139 "@entryPointOutput"
Name 144 "g_tTex3df4"
Name 147 "g_tTex3di4"
Name 150 "g_tTex3du4"
Name 153 "g_tTex1df4a"
Name 156 "g_tTex1di4a"
Name 159 "g_tTex1du4a"
Name 162 "g_tTex2df4a"
Name 165 "g_tTex2di4a"
Name 168 "g_tTex2du4a"
Name 171 "g_tTexcdf4a"
Name 174 "g_tTexcdi4a"
Name 177 "g_tTexcdu4a"
Name 138 "PS_OUTPUT"
MemberName 138(PS_OUTPUT) 0 "Color"
MemberName 138(PS_OUTPUT) 1 "Depth"
Name 140 "@entryPointOutput"
Name 145 "g_tTex3df4"
Name 148 "g_tTex3di4"
Name 151 "g_tTex3du4"
Name 154 "g_tTex1df4a"
Name 157 "g_tTex1di4a"
Name 160 "g_tTex1du4a"
Name 163 "g_tTex2df4a"
Name 166 "g_tTex2di4a"
Name 169 "g_tTex2du4a"
Name 172 "g_tTexcdf4a"
Name 175 "g_tTexcdi4a"
Name 178 "g_tTexcdu4a"
Decorate 11(g_tTex1df4) DescriptorSet 0
Decorate 11(g_tTex1df4) Binding 0
Decorate 15(g_sSamp) DescriptorSet 0
@ -438,18 +441,20 @@ gl_FragCoord origin is upper left
Decorate 106(g_tTexcdi4) DescriptorSet 0
Decorate 118(g_tTexcdu4) DescriptorSet 0
MemberDecorate 128(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 144(g_tTex3df4) DescriptorSet 0
Decorate 147(g_tTex3di4) DescriptorSet 0
Decorate 150(g_tTex3du4) DescriptorSet 0
Decorate 153(g_tTex1df4a) DescriptorSet 0
Decorate 156(g_tTex1di4a) DescriptorSet 0
Decorate 159(g_tTex1du4a) DescriptorSet 0
Decorate 162(g_tTex2df4a) DescriptorSet 0
Decorate 165(g_tTex2di4a) DescriptorSet 0
Decorate 168(g_tTex2du4a) DescriptorSet 0
Decorate 171(g_tTexcdf4a) DescriptorSet 0
Decorate 174(g_tTexcdi4a) DescriptorSet 0
Decorate 177(g_tTexcdu4a) DescriptorSet 0
MemberDecorate 138(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 140(@entryPointOutput) Location 0
Decorate 145(g_tTex3df4) DescriptorSet 0
Decorate 148(g_tTex3di4) DescriptorSet 0
Decorate 151(g_tTex3du4) DescriptorSet 0
Decorate 154(g_tTex1df4a) DescriptorSet 0
Decorate 157(g_tTex1di4a) DescriptorSet 0
Decorate 160(g_tTex1du4a) DescriptorSet 0
Decorate 163(g_tTex2df4a) DescriptorSet 0
Decorate 166(g_tTex2di4a) DescriptorSet 0
Decorate 169(g_tTex2du4a) DescriptorSet 0
Decorate 172(g_tTexcdf4a) DescriptorSet 0
Decorate 175(g_tTexcdi4a) DescriptorSet 0
Decorate 178(g_tTexcdu4a) DescriptorSet 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@ -521,44 +526,45 @@ gl_FragCoord origin is upper left
133: 127(fvec4) ConstantComposite 132 132 132 132
134: TypePointer Function 127(fvec4)
136: 26(int) Constant 1
138: TypePointer Output 128(PS_OUTPUT)
139(@entryPointOutput): 138(ptr) Variable Output
142: TypeImage 6(float) 3D sampled format:Unknown
143: TypePointer UniformConstant 142
144(g_tTex3df4): 143(ptr) Variable UniformConstant
145: TypeImage 26(int) 3D sampled format:Unknown
146: TypePointer UniformConstant 145
147(g_tTex3di4): 146(ptr) Variable UniformConstant
148: TypeImage 38(int) 3D sampled format:Unknown
149: TypePointer UniformConstant 148
150(g_tTex3du4): 149(ptr) Variable UniformConstant
151: TypeImage 6(float) 1D array sampled format:Unknown
152: TypePointer UniformConstant 151
153(g_tTex1df4a): 152(ptr) Variable UniformConstant
154: TypeImage 26(int) 1D array sampled format:Unknown
155: TypePointer UniformConstant 154
156(g_tTex1di4a): 155(ptr) Variable UniformConstant
157: TypeImage 38(int) 1D array sampled format:Unknown
158: TypePointer UniformConstant 157
159(g_tTex1du4a): 158(ptr) Variable UniformConstant
160: TypeImage 6(float) 2D array sampled format:Unknown
161: TypePointer UniformConstant 160
162(g_tTex2df4a): 161(ptr) Variable UniformConstant
163: TypeImage 26(int) 2D array sampled format:Unknown
164: TypePointer UniformConstant 163
165(g_tTex2di4a): 164(ptr) Variable UniformConstant
166: TypeImage 38(int) 2D array sampled format:Unknown
167: TypePointer UniformConstant 166
168(g_tTex2du4a): 167(ptr) Variable UniformConstant
169: TypeImage 6(float) Cube array sampled format:Unknown
170: TypePointer UniformConstant 169
171(g_tTexcdf4a): 170(ptr) Variable UniformConstant
172: TypeImage 26(int) Cube array sampled format:Unknown
173: TypePointer UniformConstant 172
174(g_tTexcdi4a): 173(ptr) Variable UniformConstant
175: TypeImage 38(int) Cube array sampled format:Unknown
176: TypePointer UniformConstant 175
177(g_tTexcdu4a): 176(ptr) Variable UniformConstant
138(PS_OUTPUT): TypeStruct 127(fvec4) 6(float)
139: TypePointer Output 138(PS_OUTPUT)
140(@entryPointOutput): 139(ptr) Variable Output
143: TypeImage 6(float) 3D sampled format:Unknown
144: TypePointer UniformConstant 143
145(g_tTex3df4): 144(ptr) Variable UniformConstant
146: TypeImage 26(int) 3D sampled format:Unknown
147: TypePointer UniformConstant 146
148(g_tTex3di4): 147(ptr) Variable UniformConstant
149: TypeImage 38(int) 3D sampled format:Unknown
150: TypePointer UniformConstant 149
151(g_tTex3du4): 150(ptr) Variable UniformConstant
152: TypeImage 6(float) 1D array sampled format:Unknown
153: TypePointer UniformConstant 152
154(g_tTex1df4a): 153(ptr) Variable UniformConstant
155: TypeImage 26(int) 1D array sampled format:Unknown
156: TypePointer UniformConstant 155
157(g_tTex1di4a): 156(ptr) Variable UniformConstant
158: TypeImage 38(int) 1D array sampled format:Unknown
159: TypePointer UniformConstant 158
160(g_tTex1du4a): 159(ptr) Variable UniformConstant
161: TypeImage 6(float) 2D array sampled format:Unknown
162: TypePointer UniformConstant 161
163(g_tTex2df4a): 162(ptr) Variable UniformConstant
164: TypeImage 26(int) 2D array sampled format:Unknown
165: TypePointer UniformConstant 164
166(g_tTex2di4a): 165(ptr) Variable UniformConstant
167: TypeImage 38(int) 2D array sampled format:Unknown
168: TypePointer UniformConstant 167
169(g_tTex2du4a): 168(ptr) Variable UniformConstant
170: TypeImage 6(float) Cube array sampled format:Unknown
171: TypePointer UniformConstant 170
172(g_tTexcdf4a): 171(ptr) Variable UniformConstant
173: TypeImage 26(int) Cube array sampled format:Unknown
174: TypePointer UniformConstant 173
175(g_tTexcdi4a): 174(ptr) Variable UniformConstant
176: TypeImage 38(int) Cube array sampled format:Unknown
177: TypePointer UniformConstant 176
178(g_tTexcdu4a): 177(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
8(r00): 7(ptr) Variable Function
@ -635,7 +641,7 @@ gl_FragCoord origin is upper left
Store 135 133
137: 7(ptr) AccessChain 130(psout) 136
Store 137 132
140:128(PS_OUTPUT) Load 130(psout)
Store 139(@entryPointOutput) 140
141:128(PS_OUTPUT) Load 130(psout)
Store 140(@entryPointOutput) 141
Return
FunctionEnd