SPV: Tighten up number of struct-types declared based on decoration.
Takes some pressure off of issue #304. Structures don't inherit locations and then explicitly decorate members with them, so removed this reason to have another instance of a structure type.
This commit is contained in:
parent
5e56423046
commit
f2b7f3353b
61 changed files with 2057 additions and 2308 deletions
|
|
@ -435,13 +435,13 @@ gl_FragCoord origin is upper left
|
|||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80001
|
||||
// Id's are bound by 155
|
||||
// Id's are bound by 154
|
||||
|
||||
Capability Shader
|
||||
Capability Sampled1D
|
||||
1: ExtInstImport "GLSL.std.450"
|
||||
MemoryModel Logical GLSL450
|
||||
EntryPoint Fragment 4 "main" 142
|
||||
EntryPoint Fragment 4 "main" 141
|
||||
ExecutionMode 4 OriginUpperLeft
|
||||
Name 4 "main"
|
||||
Name 9 "txval10"
|
||||
|
|
@ -467,14 +467,11 @@ gl_FragCoord origin is upper left
|
|||
MemberName 132(PS_OUTPUT) 0 "Color"
|
||||
MemberName 132(PS_OUTPUT) 1 "Depth"
|
||||
Name 134 "psout"
|
||||
Name 140 "PS_OUTPUT"
|
||||
MemberName 140(PS_OUTPUT) 0 "Color"
|
||||
MemberName 140(PS_OUTPUT) 1 "Depth"
|
||||
Name 142 "@entryPointOutput"
|
||||
Name 145 "g_tTex1df4a"
|
||||
Name 148 "g_tTexcdf4"
|
||||
Name 151 "g_tTexcdi4"
|
||||
Name 154 "g_tTexcdu4"
|
||||
Name 141 "@entryPointOutput"
|
||||
Name 144 "g_tTex1df4a"
|
||||
Name 147 "g_tTexcdf4"
|
||||
Name 150 "g_tTexcdi4"
|
||||
Name 153 "g_tTexcdu4"
|
||||
Decorate 12(g_tTex1df4) DescriptorSet 0
|
||||
Decorate 12(g_tTex1df4) Binding 0
|
||||
Decorate 16(g_sSamp) DescriptorSet 0
|
||||
|
|
@ -488,13 +485,12 @@ gl_FragCoord origin is upper left
|
|||
Decorate 110(g_tTex3di4) DescriptorSet 0
|
||||
Decorate 121(g_tTex3du4) DescriptorSet 0
|
||||
MemberDecorate 132(PS_OUTPUT) 1 BuiltIn FragDepth
|
||||
MemberDecorate 140(PS_OUTPUT) 1 BuiltIn FragDepth
|
||||
Decorate 142(@entryPointOutput) Location 0
|
||||
Decorate 145(g_tTex1df4a) DescriptorSet 0
|
||||
Decorate 145(g_tTex1df4a) Binding 1
|
||||
Decorate 148(g_tTexcdf4) DescriptorSet 0
|
||||
Decorate 151(g_tTexcdi4) DescriptorSet 0
|
||||
Decorate 154(g_tTexcdu4) DescriptorSet 0
|
||||
Decorate 141(@entryPointOutput) Location 0
|
||||
Decorate 144(g_tTex1df4a) DescriptorSet 0
|
||||
Decorate 144(g_tTex1df4a) Binding 1
|
||||
Decorate 147(g_tTexcdf4) DescriptorSet 0
|
||||
Decorate 150(g_tTexcdi4) DescriptorSet 0
|
||||
Decorate 153(g_tTexcdu4) DescriptorSet 0
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeFloat 32
|
||||
|
|
@ -583,19 +579,18 @@ gl_FragCoord origin is upper left
|
|||
135: 6(float) Constant 1065353216
|
||||
136: 7(fvec4) ConstantComposite 135 135 135 135
|
||||
138: TypePointer Function 6(float)
|
||||
140(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
|
||||
141: TypePointer Output 140(PS_OUTPUT)
|
||||
142(@entryPointOutput): 141(ptr) Variable Output
|
||||
145(g_tTex1df4a): 11(ptr) Variable UniformConstant
|
||||
146: TypeImage 6(float) Cube sampled format:Unknown
|
||||
147: TypePointer UniformConstant 146
|
||||
148(g_tTexcdf4): 147(ptr) Variable UniformConstant
|
||||
149: TypeImage 23(int) Cube sampled format:Unknown
|
||||
150: TypePointer UniformConstant 149
|
||||
151(g_tTexcdi4): 150(ptr) Variable UniformConstant
|
||||
152: TypeImage 38(int) Cube sampled format:Unknown
|
||||
153: TypePointer UniformConstant 152
|
||||
154(g_tTexcdu4): 153(ptr) Variable UniformConstant
|
||||
140: TypePointer Output 132(PS_OUTPUT)
|
||||
141(@entryPointOutput): 140(ptr) Variable Output
|
||||
144(g_tTex1df4a): 11(ptr) Variable UniformConstant
|
||||
145: TypeImage 6(float) Cube sampled format:Unknown
|
||||
146: TypePointer UniformConstant 145
|
||||
147(g_tTexcdf4): 146(ptr) Variable UniformConstant
|
||||
148: TypeImage 23(int) Cube sampled format:Unknown
|
||||
149: TypePointer UniformConstant 148
|
||||
150(g_tTexcdi4): 149(ptr) Variable UniformConstant
|
||||
151: TypeImage 38(int) Cube sampled format:Unknown
|
||||
152: TypePointer UniformConstant 151
|
||||
153(g_tTexcdu4): 152(ptr) Variable UniformConstant
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
9(txval10): 8(ptr) Variable Function
|
||||
|
|
@ -657,7 +652,7 @@ gl_FragCoord origin is upper left
|
|||
Store 137 136
|
||||
139: 138(ptr) AccessChain 134(psout) 24
|
||||
Store 139 135
|
||||
143:132(PS_OUTPUT) Load 134(psout)
|
||||
Store 142(@entryPointOutput) 143
|
||||
142:132(PS_OUTPUT) Load 134(psout)
|
||||
Store 141(@entryPointOutput) 142
|
||||
Return
|
||||
FunctionEnd
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue