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:
@@ -55,24 +55,22 @@ gl_FragCoord origin is upper left
|
||||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80001
|
||||
// Id's are bound by 28
|
||||
// Id's are bound by 27
|
||||
|
||||
Capability Shader
|
||||
1: ExtInstImport "GLSL.std.450"
|
||||
MemoryModel Logical GLSL450
|
||||
EntryPoint Fragment 4 "main" 20
|
||||
EntryPoint Fragment 4 "main" 19
|
||||
ExecutionMode 4 OriginUpperLeft
|
||||
Name 4 "main"
|
||||
Name 8 "PS_OUTPUT"
|
||||
MemberName 8(PS_OUTPUT) 0 "Color"
|
||||
Name 10 "psout"
|
||||
Name 18 "PS_OUTPUT"
|
||||
MemberName 18(PS_OUTPUT) 0 "Color"
|
||||
Name 20 "@entryPointOutput"
|
||||
Name 25 "TestTexture"
|
||||
Name 27 "TestUF"
|
||||
Decorate 20(@entryPointOutput) Location 0
|
||||
Decorate 25(TestTexture) DescriptorSet 0
|
||||
Name 19 "@entryPointOutput"
|
||||
Name 24 "TestTexture"
|
||||
Name 26 "TestUF"
|
||||
Decorate 19(@entryPointOutput) Location 0
|
||||
Decorate 24(TestTexture) DescriptorSet 0
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeFloat 32
|
||||
@@ -85,20 +83,19 @@ gl_FragCoord origin is upper left
|
||||
14: 6(float) Constant 1065353216
|
||||
15: 7(fvec4) ConstantComposite 13 13 13 14
|
||||
16: TypePointer Function 7(fvec4)
|
||||
18(PS_OUTPUT): TypeStruct 7(fvec4)
|
||||
19: TypePointer Output 18(PS_OUTPUT)
|
||||
20(@entryPointOutput): 19(ptr) Variable Output
|
||||
23: TypeImage 6(float) 2D sampled format:Unknown
|
||||
24: TypePointer UniformConstant 23
|
||||
25(TestTexture): 24(ptr) Variable UniformConstant
|
||||
26: TypePointer UniformConstant 7(fvec4)
|
||||
27(TestUF): 26(ptr) Variable UniformConstant
|
||||
18: TypePointer Output 8(PS_OUTPUT)
|
||||
19(@entryPointOutput): 18(ptr) Variable Output
|
||||
22: TypeImage 6(float) 2D sampled format:Unknown
|
||||
23: TypePointer UniformConstant 22
|
||||
24(TestTexture): 23(ptr) Variable UniformConstant
|
||||
25: TypePointer UniformConstant 7(fvec4)
|
||||
26(TestUF): 25(ptr) Variable UniformConstant
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
10(psout): 9(ptr) Variable Function
|
||||
17: 16(ptr) AccessChain 10(psout) 12
|
||||
Store 17 15
|
||||
21:8(PS_OUTPUT) Load 10(psout)
|
||||
Store 20(@entryPointOutput) 21
|
||||
20:8(PS_OUTPUT) Load 10(psout)
|
||||
Store 19(@entryPointOutput) 20
|
||||
Return
|
||||
FunctionEnd
|
||||
|
||||
Reference in New Issue
Block a user