HLSL: Make the entry-point shadow function have non-IO params and return.
This also removes an no longer needed makeTemporary() and rationalizes makeTypeNonIo()'s interface.
This commit is contained in:
John Kessenich
parent
5d3023af03
commit
abd8dca86d
24 changed files with 1146 additions and 1346 deletions
|
|
@ -1,7 +1,7 @@
|
|||
hlsl.samplegrad.basic.dx10.vert
|
||||
Shader version: 450
|
||||
0:? Sequence
|
||||
0:27 Function Definition: @main( (temp structure{temp 4-component vector of float Position Pos})
|
||||
0:27 Function Definition: @main( (temp structure{temp 4-component vector of float Pos})
|
||||
0:27 Function Parameters:
|
||||
0:? Sequence
|
||||
0:30 Sequence
|
||||
|
|
@ -223,8 +223,8 @@ Shader version: 450
|
|||
0:27 Sequence
|
||||
0:27 move second child to first child (temp 4-component vector of float)
|
||||
0:? '@entryPointOutput_Pos' (out 4-component vector of float Position)
|
||||
0:27 Pos: direct index for structure (temp 4-component vector of float Position)
|
||||
0:27 Function Call: @main( (temp structure{temp 4-component vector of float Position Pos})
|
||||
0:27 Pos: direct index for structure (temp 4-component vector of float)
|
||||
0:27 Function Call: @main( (temp structure{temp 4-component vector of float Pos})
|
||||
0:27 Constant:
|
||||
0:27 0 (const int)
|
||||
0:? Linker Objects
|
||||
|
|
@ -250,7 +250,7 @@ Linked vertex stage:
|
|||
|
||||
Shader version: 450
|
||||
0:? Sequence
|
||||
0:27 Function Definition: @main( (temp structure{temp 4-component vector of float Position Pos})
|
||||
0:27 Function Definition: @main( (temp structure{temp 4-component vector of float Pos})
|
||||
0:27 Function Parameters:
|
||||
0:? Sequence
|
||||
0:30 Sequence
|
||||
|
|
@ -472,8 +472,8 @@ Shader version: 450
|
|||
0:27 Sequence
|
||||
0:27 move second child to first child (temp 4-component vector of float)
|
||||
0:? '@entryPointOutput_Pos' (out 4-component vector of float Position)
|
||||
0:27 Pos: direct index for structure (temp 4-component vector of float Position)
|
||||
0:27 Function Call: @main( (temp structure{temp 4-component vector of float Position Pos})
|
||||
0:27 Pos: direct index for structure (temp 4-component vector of float)
|
||||
0:27 Function Call: @main( (temp structure{temp 4-component vector of float Pos})
|
||||
0:27 Constant:
|
||||
0:27 0 (const int)
|
||||
0:? Linker Objects
|
||||
|
|
@ -495,13 +495,13 @@ Shader version: 450
|
|||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80001
|
||||
// Id's are bound by 175
|
||||
// Id's are bound by 169
|
||||
|
||||
Capability Shader
|
||||
Capability Sampled1D
|
||||
1: ExtInstImport "GLSL.std.450"
|
||||
MemoryModel Logical GLSL450
|
||||
EntryPoint Vertex 4 "main" 168 174
|
||||
EntryPoint Vertex 4 "main" 162 168
|
||||
Name 4 "main"
|
||||
Name 8 "VS_OUTPUT"
|
||||
MemberName 8(VS_OUTPUT) 0 "Pos"
|
||||
|
|
@ -531,15 +531,12 @@ Shader version: 450
|
|||
Name 137 "g_tTexcdi4"
|
||||
Name 143 "txval42"
|
||||
Name 146 "g_tTexcdu4"
|
||||
Name 152 "VS_OUTPUT"
|
||||
MemberName 152(VS_OUTPUT) 0 "Pos"
|
||||
Name 154 "vsout"
|
||||
Name 168 "@entryPointOutput_Pos"
|
||||
Name 171 "g_tTex1df4a"
|
||||
Name 172 "PerVertex_out"
|
||||
MemberName 172(PerVertex_out) 0 "@entryPointOutput_Pos"
|
||||
Name 174 "PerVertex_out"
|
||||
MemberDecorate 8(VS_OUTPUT) 0 BuiltIn Position
|
||||
Name 153 "vsout"
|
||||
Name 162 "@entryPointOutput_Pos"
|
||||
Name 165 "g_tTex1df4a"
|
||||
Name 166 "PerVertex_out"
|
||||
MemberName 166(PerVertex_out) 0 "@entryPointOutput_Pos"
|
||||
Name 168 "PerVertex_out"
|
||||
Decorate 16(g_tTex1df4) DescriptorSet 0
|
||||
Decorate 16(g_tTex1df4) Binding 0
|
||||
Decorate 20(g_sSamp) DescriptorSet 0
|
||||
|
|
@ -555,11 +552,11 @@ Shader version: 450
|
|||
Decorate 128(g_tTexcdf4) DescriptorSet 0
|
||||
Decorate 137(g_tTexcdi4) DescriptorSet 0
|
||||
Decorate 146(g_tTexcdu4) DescriptorSet 0
|
||||
Decorate 168(@entryPointOutput_Pos) BuiltIn Position
|
||||
Decorate 171(g_tTex1df4a) DescriptorSet 0
|
||||
Decorate 171(g_tTex1df4a) Binding 1
|
||||
MemberDecorate 172(PerVertex_out) 0 BuiltIn Position
|
||||
Decorate 172(PerVertex_out) Block
|
||||
Decorate 162(@entryPointOutput_Pos) BuiltIn Position
|
||||
Decorate 165(g_tTex1df4a) DescriptorSet 0
|
||||
Decorate 165(g_tTex1df4a) Binding 1
|
||||
MemberDecorate 166(PerVertex_out) 0 BuiltIn Position
|
||||
Decorate 166(PerVertex_out) Block
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeFloat 32
|
||||
|
|
@ -646,23 +643,21 @@ Shader version: 450
|
|||
145: TypePointer UniformConstant 144
|
||||
146(g_tTexcdu4): 145(ptr) Variable UniformConstant
|
||||
149: TypeSampledImage 144
|
||||
152(VS_OUTPUT): TypeStruct 7(fvec4)
|
||||
153: TypePointer Function 152(VS_OUTPUT)
|
||||
155: 28(int) Constant 0
|
||||
156: 6(float) Constant 0
|
||||
157: 7(fvec4) ConstantComposite 156 156 156 156
|
||||
160: TypePointer Function 8(VS_OUTPUT)
|
||||
167: TypePointer Output 7(fvec4)
|
||||
168(@entryPointOutput_Pos): 167(ptr) Variable Output
|
||||
171(g_tTex1df4a): 15(ptr) Variable UniformConstant
|
||||
172(PerVertex_out): TypeStruct 7(fvec4)
|
||||
173: TypePointer Output 172(PerVertex_out)
|
||||
174(PerVertex_out): 173(ptr) Variable Output
|
||||
152: TypePointer Function 8(VS_OUTPUT)
|
||||
154: 28(int) Constant 0
|
||||
155: 6(float) Constant 0
|
||||
156: 7(fvec4) ConstantComposite 155 155 155 155
|
||||
161: TypePointer Output 7(fvec4)
|
||||
162(@entryPointOutput_Pos): 161(ptr) Variable Output
|
||||
165(g_tTex1df4a): 15(ptr) Variable UniformConstant
|
||||
166(PerVertex_out): TypeStruct 7(fvec4)
|
||||
167: TypePointer Output 166(PerVertex_out)
|
||||
168(PerVertex_out): 167(ptr) Variable Output
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
169:8(VS_OUTPUT) FunctionCall 10(@main()
|
||||
170: 7(fvec4) CompositeExtract 169 0
|
||||
Store 168(@entryPointOutput_Pos) 170
|
||||
163:8(VS_OUTPUT) FunctionCall 10(@main()
|
||||
164: 7(fvec4) CompositeExtract 163 0
|
||||
Store 162(@entryPointOutput_Pos) 164
|
||||
Return
|
||||
FunctionEnd
|
||||
10(@main():8(VS_OUTPUT) Function None 9
|
||||
|
|
@ -679,8 +674,7 @@ Shader version: 450
|
|||
125(txval40): 12(ptr) Variable Function
|
||||
134(txval41): 30(ptr) Variable Function
|
||||
143(txval42): 43(ptr) Variable Function
|
||||
154(vsout): 153(ptr) Variable Function
|
||||
161: 160(ptr) Variable Function
|
||||
153(vsout): 152(ptr) Variable Function
|
||||
17: 14 Load 16(g_tTex1df4)
|
||||
21: 18 Load 20(g_sSamp)
|
||||
23: 22 SampledImage 17 21
|
||||
|
|
@ -741,12 +735,8 @@ Shader version: 450
|
|||
150: 149 SampledImage 147 148
|
||||
151: 42(ivec4) ImageSampleExplicitLod 150 123 Grad 100 100
|
||||
Store 143(txval42) 151
|
||||
158: 12(ptr) AccessChain 154(vsout) 155
|
||||
Store 158 157
|
||||
159:152(VS_OUTPUT) Load 154(vsout)
|
||||
162: 7(fvec4) CompositeExtract 159 0
|
||||
163: 12(ptr) AccessChain 161 155
|
||||
Store 163 162
|
||||
164:8(VS_OUTPUT) Load 161
|
||||
ReturnValue 164
|
||||
157: 12(ptr) AccessChain 153(vsout) 154
|
||||
Store 157 156
|
||||
158:8(VS_OUTPUT) Load 153(vsout)
|
||||
ReturnValue 158
|
||||
FunctionEnd
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue