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
|
|
@ -321,7 +321,7 @@ gl_FragCoord origin is upper left
|
|||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80001
|
||||
// Id's are bound by 146
|
||||
// Id's are bound by 145
|
||||
|
||||
Capability Shader
|
||||
Capability Sampled1D
|
||||
|
|
@ -329,7 +329,7 @@ gl_FragCoord origin is upper left
|
|||
Capability ImageQuery
|
||||
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 8 "txval10"
|
||||
|
|
@ -355,11 +355,8 @@ gl_FragCoord origin is upper left
|
|||
MemberName 131(PS_OUTPUT) 0 "Color"
|
||||
MemberName 131(PS_OUTPUT) 1 "Depth"
|
||||
Name 133 "psout"
|
||||
Name 140 "PS_OUTPUT"
|
||||
MemberName 140(PS_OUTPUT) 0 "Color"
|
||||
MemberName 140(PS_OUTPUT) 1 "Depth"
|
||||
Name 142 "@entryPointOutput"
|
||||
Name 145 "g_tTex1df4"
|
||||
Name 141 "@entryPointOutput"
|
||||
Name 144 "g_tTex1df4"
|
||||
Decorate 11(g_tTex1df4a) DescriptorSet 0
|
||||
Decorate 11(g_tTex1df4a) Binding 1
|
||||
Decorate 15(g_sSamp) DescriptorSet 0
|
||||
|
|
@ -373,10 +370,9 @@ gl_FragCoord origin is upper left
|
|||
Decorate 106(g_tTexcdi4a) DescriptorSet 0
|
||||
Decorate 118(g_tTexcdu4a) DescriptorSet 0
|
||||
MemberDecorate 131(PS_OUTPUT) 1 BuiltIn FragDepth
|
||||
MemberDecorate 140(PS_OUTPUT) 1 BuiltIn FragDepth
|
||||
Decorate 142(@entryPointOutput) Location 0
|
||||
Decorate 145(g_tTex1df4) DescriptorSet 0
|
||||
Decorate 145(g_tTex1df4) Binding 0
|
||||
Decorate 141(@entryPointOutput) Location 0
|
||||
Decorate 144(g_tTex1df4) DescriptorSet 0
|
||||
Decorate 144(g_tTex1df4) Binding 0
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeFloat 32
|
||||
|
|
@ -447,10 +443,9 @@ gl_FragCoord origin is upper left
|
|||
135: 130(fvec4) ConstantComposite 134 134 134 134
|
||||
136: TypePointer Function 130(fvec4)
|
||||
138: 23(int) Constant 1
|
||||
140(PS_OUTPUT): TypeStruct 130(fvec4) 6(float)
|
||||
141: TypePointer Output 140(PS_OUTPUT)
|
||||
142(@entryPointOutput): 141(ptr) Variable Output
|
||||
145(g_tTex1df4): 10(ptr) Variable UniformConstant
|
||||
140: TypePointer Output 131(PS_OUTPUT)
|
||||
141(@entryPointOutput): 140(ptr) Variable Output
|
||||
144(g_tTex1df4): 10(ptr) Variable UniformConstant
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
8(txval10): 7(ptr) Variable Function
|
||||
|
|
@ -530,7 +525,7 @@ gl_FragCoord origin is upper left
|
|||
Store 137 135
|
||||
139: 7(ptr) AccessChain 133(psout) 138
|
||||
Store 139 134
|
||||
143:131(PS_OUTPUT) Load 133(psout)
|
||||
Store 142(@entryPointOutput) 143
|
||||
142:131(PS_OUTPUT) Load 133(psout)
|
||||
Store 141(@entryPointOutput) 142
|
||||
Return
|
||||
FunctionEnd
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue