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:
John Kessenich
@@ -171,13 +171,13 @@ gl_FragCoord origin is upper left
|
||||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80001
|
||||
// Id's are bound by 103
|
||||
// Id's are bound by 102
|
||||
|
||||
Capability Shader
|
||||
Capability Sampled1D
|
||||
1: ExtInstImport "GLSL.std.450"
|
||||
MemoryModel Logical GLSL450
|
||||
EntryPoint Fragment 4 "main" 72
|
||||
EntryPoint Fragment 4 "main" 71
|
||||
ExecutionMode 4 OriginUpperLeft
|
||||
Name 4 "main"
|
||||
Name 9 "txval20"
|
||||
@@ -191,40 +191,36 @@ gl_FragCoord origin is upper left
|
||||
MemberName 62(PS_OUTPUT) 0 "Color"
|
||||
MemberName 62(PS_OUTPUT) 1 "Depth"
|
||||
Name 64 "psout"
|
||||
Name 70 "PS_OUTPUT"
|
||||
MemberName 70(PS_OUTPUT) 0 "Color"
|
||||
MemberName 70(PS_OUTPUT) 1 "Depth"
|
||||
Name 72 "@entryPointOutput"
|
||||
Name 77 "g_tTex1df4a"
|
||||
Name 78 "g_tTex1df4"
|
||||
Name 81 "g_tTex1di4"
|
||||
Name 84 "g_tTex1du4"
|
||||
Name 87 "g_tTex3df4"
|
||||
Name 90 "g_tTex3di4"
|
||||
Name 93 "g_tTex3du4"
|
||||
Name 96 "g_tTexcdf4"
|
||||
Name 99 "g_tTexcdi4"
|
||||
Name 102 "g_tTexcdu4"
|
||||
Name 71 "@entryPointOutput"
|
||||
Name 76 "g_tTex1df4a"
|
||||
Name 77 "g_tTex1df4"
|
||||
Name 80 "g_tTex1di4"
|
||||
Name 83 "g_tTex1du4"
|
||||
Name 86 "g_tTex3df4"
|
||||
Name 89 "g_tTex3di4"
|
||||
Name 92 "g_tTex3du4"
|
||||
Name 95 "g_tTexcdf4"
|
||||
Name 98 "g_tTexcdi4"
|
||||
Name 101 "g_tTexcdu4"
|
||||
Decorate 12(g_tTex2df4) DescriptorSet 0
|
||||
Decorate 16(g_sSamp) DescriptorSet 0
|
||||
Decorate 16(g_sSamp) Binding 0
|
||||
Decorate 35(g_tTex2di4) DescriptorSet 0
|
||||
Decorate 51(g_tTex2du4) DescriptorSet 0
|
||||
MemberDecorate 62(PS_OUTPUT) 1 BuiltIn FragDepth
|
||||
MemberDecorate 70(PS_OUTPUT) 1 BuiltIn FragDepth
|
||||
Decorate 72(@entryPointOutput) Location 0
|
||||
Decorate 77(g_tTex1df4a) DescriptorSet 0
|
||||
Decorate 77(g_tTex1df4a) Binding 1
|
||||
Decorate 78(g_tTex1df4) DescriptorSet 0
|
||||
Decorate 78(g_tTex1df4) Binding 0
|
||||
Decorate 81(g_tTex1di4) DescriptorSet 0
|
||||
Decorate 84(g_tTex1du4) DescriptorSet 0
|
||||
Decorate 87(g_tTex3df4) DescriptorSet 0
|
||||
Decorate 90(g_tTex3di4) DescriptorSet 0
|
||||
Decorate 93(g_tTex3du4) DescriptorSet 0
|
||||
Decorate 96(g_tTexcdf4) DescriptorSet 0
|
||||
Decorate 99(g_tTexcdi4) DescriptorSet 0
|
||||
Decorate 102(g_tTexcdu4) DescriptorSet 0
|
||||
Decorate 71(@entryPointOutput) Location 0
|
||||
Decorate 76(g_tTex1df4a) DescriptorSet 0
|
||||
Decorate 76(g_tTex1df4a) Binding 1
|
||||
Decorate 77(g_tTex1df4) DescriptorSet 0
|
||||
Decorate 77(g_tTex1df4) Binding 0
|
||||
Decorate 80(g_tTex1di4) DescriptorSet 0
|
||||
Decorate 83(g_tTex1du4) DescriptorSet 0
|
||||
Decorate 86(g_tTex3df4) DescriptorSet 0
|
||||
Decorate 89(g_tTex3di4) DescriptorSet 0
|
||||
Decorate 92(g_tTex3du4) DescriptorSet 0
|
||||
Decorate 95(g_tTexcdf4) DescriptorSet 0
|
||||
Decorate 98(g_tTexcdi4) DescriptorSet 0
|
||||
Decorate 101(g_tTexcdu4) DescriptorSet 0
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeFloat 32
|
||||
@@ -273,37 +269,36 @@ gl_FragCoord origin is upper left
|
||||
65: 6(float) Constant 1065353216
|
||||
66: 7(fvec4) ConstantComposite 65 65 65 65
|
||||
68: TypePointer Function 6(float)
|
||||
70(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
|
||||
71: TypePointer Output 70(PS_OUTPUT)
|
||||
72(@entryPointOutput): 71(ptr) Variable Output
|
||||
75: TypeImage 6(float) 1D sampled format:Unknown
|
||||
76: TypePointer UniformConstant 75
|
||||
77(g_tTex1df4a): 76(ptr) Variable UniformConstant
|
||||
78(g_tTex1df4): 76(ptr) Variable UniformConstant
|
||||
79: TypeImage 24(int) 1D sampled format:Unknown
|
||||
80: TypePointer UniformConstant 79
|
||||
81(g_tTex1di4): 80(ptr) Variable UniformConstant
|
||||
82: TypeImage 45(int) 1D sampled format:Unknown
|
||||
83: TypePointer UniformConstant 82
|
||||
84(g_tTex1du4): 83(ptr) Variable UniformConstant
|
||||
85: TypeImage 6(float) 3D sampled format:Unknown
|
||||
86: TypePointer UniformConstant 85
|
||||
87(g_tTex3df4): 86(ptr) Variable UniformConstant
|
||||
88: TypeImage 24(int) 3D sampled format:Unknown
|
||||
89: TypePointer UniformConstant 88
|
||||
90(g_tTex3di4): 89(ptr) Variable UniformConstant
|
||||
91: TypeImage 45(int) 3D sampled format:Unknown
|
||||
92: TypePointer UniformConstant 91
|
||||
93(g_tTex3du4): 92(ptr) Variable UniformConstant
|
||||
94: TypeImage 6(float) Cube sampled format:Unknown
|
||||
95: TypePointer UniformConstant 94
|
||||
96(g_tTexcdf4): 95(ptr) Variable UniformConstant
|
||||
97: TypeImage 24(int) Cube sampled format:Unknown
|
||||
98: TypePointer UniformConstant 97
|
||||
99(g_tTexcdi4): 98(ptr) Variable UniformConstant
|
||||
100: TypeImage 45(int) Cube sampled format:Unknown
|
||||
101: TypePointer UniformConstant 100
|
||||
102(g_tTexcdu4): 101(ptr) Variable UniformConstant
|
||||
70: TypePointer Output 62(PS_OUTPUT)
|
||||
71(@entryPointOutput): 70(ptr) Variable Output
|
||||
74: TypeImage 6(float) 1D sampled format:Unknown
|
||||
75: TypePointer UniformConstant 74
|
||||
76(g_tTex1df4a): 75(ptr) Variable UniformConstant
|
||||
77(g_tTex1df4): 75(ptr) Variable UniformConstant
|
||||
78: TypeImage 24(int) 1D sampled format:Unknown
|
||||
79: TypePointer UniformConstant 78
|
||||
80(g_tTex1di4): 79(ptr) Variable UniformConstant
|
||||
81: TypeImage 45(int) 1D sampled format:Unknown
|
||||
82: TypePointer UniformConstant 81
|
||||
83(g_tTex1du4): 82(ptr) Variable UniformConstant
|
||||
84: TypeImage 6(float) 3D sampled format:Unknown
|
||||
85: TypePointer UniformConstant 84
|
||||
86(g_tTex3df4): 85(ptr) Variable UniformConstant
|
||||
87: TypeImage 24(int) 3D sampled format:Unknown
|
||||
88: TypePointer UniformConstant 87
|
||||
89(g_tTex3di4): 88(ptr) Variable UniformConstant
|
||||
90: TypeImage 45(int) 3D sampled format:Unknown
|
||||
91: TypePointer UniformConstant 90
|
||||
92(g_tTex3du4): 91(ptr) Variable UniformConstant
|
||||
93: TypeImage 6(float) Cube sampled format:Unknown
|
||||
94: TypePointer UniformConstant 93
|
||||
95(g_tTexcdf4): 94(ptr) Variable UniformConstant
|
||||
96: TypeImage 24(int) Cube sampled format:Unknown
|
||||
97: TypePointer UniformConstant 96
|
||||
98(g_tTexcdi4): 97(ptr) Variable UniformConstant
|
||||
99: TypeImage 45(int) Cube sampled format:Unknown
|
||||
100: TypePointer UniformConstant 99
|
||||
101(g_tTexcdu4): 100(ptr) Variable UniformConstant
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
9(txval20): 8(ptr) Variable Function
|
||||
@@ -329,7 +324,7 @@ gl_FragCoord origin is upper left
|
||||
Store 67 66
|
||||
69: 68(ptr) AccessChain 64(psout) 26
|
||||
Store 69 65
|
||||
73:62(PS_OUTPUT) Load 64(psout)
|
||||
Store 72(@entryPointOutput) 73
|
||||
72:62(PS_OUTPUT) Load 64(psout)
|
||||
Store 71(@entryPointOutput) 72
|
||||
Return
|
||||
FunctionEnd
|
||||
|
||||
Reference in New Issue
Block a user