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:
@@ -387,13 +387,13 @@ gl_FragCoord origin is upper left
|
||||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80001
|
||||
// Id's are bound by 159
|
||||
// Id's are bound by 158
|
||||
|
||||
Capability Shader
|
||||
Capability Sampled1D
|
||||
1: ExtInstImport "GLSL.std.450"
|
||||
MemoryModel Logical GLSL450
|
||||
EntryPoint Fragment 4 "main" 155
|
||||
EntryPoint Fragment 4 "main" 154
|
||||
ExecutionMode 4 OriginUpperLeft
|
||||
Name 4 "main"
|
||||
Name 9 "txval10"
|
||||
@@ -425,11 +425,8 @@ gl_FragCoord origin is upper left
|
||||
MemberName 143(PS_OUTPUT) 0 "Color"
|
||||
MemberName 143(PS_OUTPUT) 1 "Depth"
|
||||
Name 145 "psout"
|
||||
Name 153 "PS_OUTPUT"
|
||||
MemberName 153(PS_OUTPUT) 0 "Color"
|
||||
MemberName 153(PS_OUTPUT) 1 "Depth"
|
||||
Name 155 "@entryPointOutput"
|
||||
Name 158 "g_tTex1df4a"
|
||||
Name 154 "@entryPointOutput"
|
||||
Name 157 "g_tTex1df4a"
|
||||
Decorate 12(g_tTex1df4) DescriptorSet 0
|
||||
Decorate 12(g_tTex1df4) Binding 0
|
||||
Decorate 16(g_sSamp) DescriptorSet 0
|
||||
@@ -446,10 +443,9 @@ gl_FragCoord origin is upper left
|
||||
Decorate 128(g_tTexcdi4) DescriptorSet 0
|
||||
Decorate 137(g_tTexcdu4) DescriptorSet 0
|
||||
MemberDecorate 143(PS_OUTPUT) 1 BuiltIn FragDepth
|
||||
MemberDecorate 153(PS_OUTPUT) 1 BuiltIn FragDepth
|
||||
Decorate 155(@entryPointOutput) Location 0
|
||||
Decorate 158(g_tTex1df4a) DescriptorSet 0
|
||||
Decorate 158(g_tTex1df4a) Binding 1
|
||||
Decorate 154(@entryPointOutput) Location 0
|
||||
Decorate 157(g_tTex1df4a) DescriptorSet 0
|
||||
Decorate 157(g_tTex1df4a) Binding 1
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeFloat 32
|
||||
@@ -536,10 +532,9 @@ gl_FragCoord origin is upper left
|
||||
148: 7(fvec4) ConstantComposite 147 147 147 147
|
||||
150: 23(int) Constant 1
|
||||
151: TypePointer Function 6(float)
|
||||
153(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
|
||||
154: TypePointer Output 153(PS_OUTPUT)
|
||||
155(@entryPointOutput): 154(ptr) Variable Output
|
||||
158(g_tTex1df4a): 11(ptr) Variable UniformConstant
|
||||
153: TypePointer Output 143(PS_OUTPUT)
|
||||
154(@entryPointOutput): 153(ptr) Variable Output
|
||||
157(g_tTex1df4a): 11(ptr) Variable UniformConstant
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
9(txval10): 8(ptr) Variable Function
|
||||
@@ -619,7 +614,7 @@ gl_FragCoord origin is upper left
|
||||
Store 149 148
|
||||
152: 151(ptr) AccessChain 145(psout) 150
|
||||
Store 152 147
|
||||
156:143(PS_OUTPUT) Load 145(psout)
|
||||
Store 155(@entryPointOutput) 156
|
||||
155:143(PS_OUTPUT) Load 145(psout)
|
||||
Store 154(@entryPointOutput) 155
|
||||
Return
|
||||
FunctionEnd
|
||||
|
||||
Reference in New Issue
Block a user