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
|
|
@ -327,13 +327,13 @@ gl_FragCoord origin is upper left
|
|||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80001
|
||||
// Id's are bound by 150
|
||||
// Id's are bound by 149
|
||||
|
||||
Capability Shader
|
||||
Capability Sampled1D
|
||||
1: ExtInstImport "GLSL.std.450"
|
||||
MemoryModel Logical GLSL450
|
||||
EntryPoint Fragment 4 "main" 137
|
||||
EntryPoint Fragment 4 "main" 136
|
||||
ExecutionMode 4 OriginUpperLeft
|
||||
Name 4 "main"
|
||||
Name 9 "txval10"
|
||||
|
|
@ -359,14 +359,11 @@ gl_FragCoord origin is upper left
|
|||
MemberName 127(PS_OUTPUT) 0 "Color"
|
||||
MemberName 127(PS_OUTPUT) 1 "Depth"
|
||||
Name 129 "psout"
|
||||
Name 135 "PS_OUTPUT"
|
||||
MemberName 135(PS_OUTPUT) 0 "Color"
|
||||
MemberName 135(PS_OUTPUT) 1 "Depth"
|
||||
Name 137 "@entryPointOutput"
|
||||
Name 140 "g_tTex1df4a"
|
||||
Name 143 "g_tTexcdf4"
|
||||
Name 146 "g_tTexcdi4"
|
||||
Name 149 "g_tTexcdu4"
|
||||
Name 136 "@entryPointOutput"
|
||||
Name 139 "g_tTex1df4a"
|
||||
Name 142 "g_tTexcdf4"
|
||||
Name 145 "g_tTexcdi4"
|
||||
Name 148 "g_tTexcdu4"
|
||||
Decorate 12(g_tTex1df4) DescriptorSet 0
|
||||
Decorate 12(g_tTex1df4) Binding 0
|
||||
Decorate 16(g_sSamp) DescriptorSet 0
|
||||
|
|
@ -380,13 +377,12 @@ gl_FragCoord origin is upper left
|
|||
Decorate 105(g_tTex3di4) DescriptorSet 0
|
||||
Decorate 116(g_tTex3du4) DescriptorSet 0
|
||||
MemberDecorate 127(PS_OUTPUT) 1 BuiltIn FragDepth
|
||||
MemberDecorate 135(PS_OUTPUT) 1 BuiltIn FragDepth
|
||||
Decorate 137(@entryPointOutput) Location 0
|
||||
Decorate 140(g_tTex1df4a) DescriptorSet 0
|
||||
Decorate 140(g_tTex1df4a) Binding 1
|
||||
Decorate 143(g_tTexcdf4) DescriptorSet 0
|
||||
Decorate 146(g_tTexcdi4) DescriptorSet 0
|
||||
Decorate 149(g_tTexcdu4) DescriptorSet 0
|
||||
Decorate 136(@entryPointOutput) Location 0
|
||||
Decorate 139(g_tTex1df4a) DescriptorSet 0
|
||||
Decorate 139(g_tTex1df4a) Binding 1
|
||||
Decorate 142(g_tTexcdf4) DescriptorSet 0
|
||||
Decorate 145(g_tTexcdi4) DescriptorSet 0
|
||||
Decorate 148(g_tTexcdu4) DescriptorSet 0
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeFloat 32
|
||||
|
|
@ -470,19 +466,18 @@ gl_FragCoord origin is upper left
|
|||
130: 6(float) Constant 1065353216
|
||||
131: 7(fvec4) ConstantComposite 130 130 130 130
|
||||
133: TypePointer Function 6(float)
|
||||
135(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
|
||||
136: TypePointer Output 135(PS_OUTPUT)
|
||||
137(@entryPointOutput): 136(ptr) Variable Output
|
||||
140(g_tTex1df4a): 11(ptr) Variable UniformConstant
|
||||
141: TypeImage 6(float) Cube sampled format:Unknown
|
||||
142: TypePointer UniformConstant 141
|
||||
143(g_tTexcdf4): 142(ptr) Variable UniformConstant
|
||||
144: TypeImage 21(int) Cube sampled format:Unknown
|
||||
145: TypePointer UniformConstant 144
|
||||
146(g_tTexcdi4): 145(ptr) Variable UniformConstant
|
||||
147: TypeImage 36(int) Cube sampled format:Unknown
|
||||
148: TypePointer UniformConstant 147
|
||||
149(g_tTexcdu4): 148(ptr) Variable UniformConstant
|
||||
135: TypePointer Output 127(PS_OUTPUT)
|
||||
136(@entryPointOutput): 135(ptr) Variable Output
|
||||
139(g_tTex1df4a): 11(ptr) Variable UniformConstant
|
||||
140: TypeImage 6(float) Cube sampled format:Unknown
|
||||
141: TypePointer UniformConstant 140
|
||||
142(g_tTexcdf4): 141(ptr) Variable UniformConstant
|
||||
143: TypeImage 21(int) Cube sampled format:Unknown
|
||||
144: TypePointer UniformConstant 143
|
||||
145(g_tTexcdi4): 144(ptr) Variable UniformConstant
|
||||
146: TypeImage 36(int) Cube sampled format:Unknown
|
||||
147: TypePointer UniformConstant 146
|
||||
148(g_tTexcdu4): 147(ptr) Variable UniformConstant
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
9(txval10): 8(ptr) Variable Function
|
||||
|
|
@ -544,7 +539,7 @@ gl_FragCoord origin is upper left
|
|||
Store 132 131
|
||||
134: 133(ptr) AccessChain 129(psout) 22
|
||||
Store 134 130
|
||||
138:127(PS_OUTPUT) Load 129(psout)
|
||||
Store 137(@entryPointOutput) 138
|
||||
137:127(PS_OUTPUT) Load 129(psout)
|
||||
Store 136(@entryPointOutput) 137
|
||||
Return
|
||||
FunctionEnd
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue