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:
@@ -495,13 +495,13 @@ gl_FragCoord origin is upper left
|
||||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80001
|
||||
// Id's are bound by 164
|
||||
// Id's are bound by 163
|
||||
|
||||
Capability Shader
|
||||
Capability Sampled1D
|
||||
1: ExtInstImport "GLSL.std.450"
|
||||
MemoryModel Logical GLSL450
|
||||
EntryPoint Fragment 4 "main" 160
|
||||
EntryPoint Fragment 4 "main" 159
|
||||
ExecutionMode 4 OriginUpperLeft
|
||||
Name 4 "main"
|
||||
Name 9 "txval10"
|
||||
@@ -533,11 +533,8 @@ gl_FragCoord origin is upper left
|
||||
MemberName 148(PS_OUTPUT) 0 "Color"
|
||||
MemberName 148(PS_OUTPUT) 1 "Depth"
|
||||
Name 150 "psout"
|
||||
Name 158 "PS_OUTPUT"
|
||||
MemberName 158(PS_OUTPUT) 0 "Color"
|
||||
MemberName 158(PS_OUTPUT) 1 "Depth"
|
||||
Name 160 "@entryPointOutput"
|
||||
Name 163 "g_tTex1df4a"
|
||||
Name 159 "@entryPointOutput"
|
||||
Name 162 "g_tTex1df4a"
|
||||
Decorate 12(g_tTex1df4) DescriptorSet 0
|
||||
Decorate 12(g_tTex1df4) Binding 0
|
||||
Decorate 16(g_sSamp) DescriptorSet 0
|
||||
@@ -554,10 +551,9 @@ gl_FragCoord origin is upper left
|
||||
Decorate 133(g_tTexcdi4) DescriptorSet 0
|
||||
Decorate 142(g_tTexcdu4) DescriptorSet 0
|
||||
MemberDecorate 148(PS_OUTPUT) 1 BuiltIn FragDepth
|
||||
MemberDecorate 158(PS_OUTPUT) 1 BuiltIn FragDepth
|
||||
Decorate 160(@entryPointOutput) Location 0
|
||||
Decorate 163(g_tTex1df4a) DescriptorSet 0
|
||||
Decorate 163(g_tTex1df4a) Binding 1
|
||||
Decorate 159(@entryPointOutput) Location 0
|
||||
Decorate 162(g_tTex1df4a) DescriptorSet 0
|
||||
Decorate 162(g_tTex1df4a) Binding 1
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeFloat 32
|
||||
@@ -649,10 +645,9 @@ gl_FragCoord origin is upper left
|
||||
153: 7(fvec4) ConstantComposite 152 152 152 152
|
||||
155: 24(int) Constant 1
|
||||
156: TypePointer Function 6(float)
|
||||
158(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
|
||||
159: TypePointer Output 158(PS_OUTPUT)
|
||||
160(@entryPointOutput): 159(ptr) Variable Output
|
||||
163(g_tTex1df4a): 11(ptr) Variable UniformConstant
|
||||
158: TypePointer Output 148(PS_OUTPUT)
|
||||
159(@entryPointOutput): 158(ptr) Variable Output
|
||||
162(g_tTex1df4a): 11(ptr) Variable UniformConstant
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
9(txval10): 8(ptr) Variable Function
|
||||
@@ -732,7 +727,7 @@ gl_FragCoord origin is upper left
|
||||
Store 154 153
|
||||
157: 156(ptr) AccessChain 150(psout) 155
|
||||
Store 157 152
|
||||
161:148(PS_OUTPUT) Load 150(psout)
|
||||
Store 160(@entryPointOutput) 161
|
||||
160:148(PS_OUTPUT) Load 150(psout)
|
||||
Store 159(@entryPointOutput) 160
|
||||
Return
|
||||
FunctionEnd
|
||||
|
||||
Reference in New Issue
Block a user