mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SPV: Tighten up number of struct-types declared based on decoration.

Browse Source 
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
2016-09-01 17:05:23 -06:00
parent 5e56423046
commit f2b7f3353b
61 changed files with 2057 additions and 2308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out
View File

@@ -363,13 +363,13 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 151
// Id's are bound by 150
Capability Shader
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 138
EntryPoint Fragment 4 "main" 137
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 9 "txval10"
@@ -395,14 +395,11 @@ gl_FragCoord origin is upper left
MemberName 128(PS_OUTPUT) 0 "Color"
MemberName 128(PS_OUTPUT) 1 "Depth"
Name 130 "psout"
Name 136 "PS_OUTPUT"
MemberName 136(PS_OUTPUT) 0 "Color"
MemberName 136(PS_OUTPUT) 1 "Depth"
Name 138 "@entryPointOutput"
Name 141 "g_tTex1df4a"
Name 144 "g_tTexcdf4"
Name 147 "g_tTexcdi4"
Name 150 "g_tTexcdu4"
Name 137 "@entryPointOutput"
Name 140 "g_tTex1df4a"
Name 143 "g_tTexcdf4"
Name 146 "g_tTexcdi4"
Name 149 "g_tTexcdu4"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0
@@ -416,13 +413,12 @@ gl_FragCoord origin is upper left
Decorate 106(g_tTex3di4) DescriptorSet 0
Decorate 117(g_tTex3du4) DescriptorSet 0
MemberDecorate 128(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 136(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 138(@entryPointOutput) Location 0
Decorate 141(g_tTex1df4a) DescriptorSet 0
Decorate 141(g_tTex1df4a) Binding 1
Decorate 144(g_tTexcdf4) DescriptorSet 0
Decorate 147(g_tTexcdi4) DescriptorSet 0
Decorate 150(g_tTexcdu4) DescriptorSet 0
Decorate 137(@entryPointOutput) Location 0
Decorate 140(g_tTex1df4a) DescriptorSet 0
Decorate 140(g_tTex1df4a) Binding 1
Decorate 143(g_tTexcdf4) DescriptorSet 0
Decorate 146(g_tTexcdi4) DescriptorSet 0
Decorate 149(g_tTexcdu4) DescriptorSet 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -507,19 +503,18 @@ gl_FragCoord origin is upper left
131: 6(float) Constant 1065353216
132: 7(fvec4) ConstantComposite 131 131 131 131
134: TypePointer Function 6(float)
136(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
137: TypePointer Output 136(PS_OUTPUT)
138(@entryPointOutput): 137(ptr) Variable Output
141(g_tTex1df4a): 11(ptr) Variable UniformConstant
142: TypeImage 6(float) Cube sampled format:Unknown
143: TypePointer UniformConstant 142
144(g_tTexcdf4): 143(ptr) Variable UniformConstant
145: TypeImage 22(int) Cube sampled format:Unknown
146: TypePointer UniformConstant 145
147(g_tTexcdi4): 146(ptr) Variable UniformConstant
148: TypeImage 37(int) Cube sampled format:Unknown
149: TypePointer UniformConstant 148
150(g_tTexcdu4): 149(ptr) Variable UniformConstant
136: TypePointer Output 128(PS_OUTPUT)
137(@entryPointOutput): 136(ptr) Variable Output
140(g_tTex1df4a): 11(ptr) Variable UniformConstant
141: TypeImage 6(float) Cube sampled format:Unknown
142: TypePointer UniformConstant 141
143(g_tTexcdf4): 142(ptr) Variable UniformConstant
144: TypeImage 22(int) Cube sampled format:Unknown
145: TypePointer UniformConstant 144
146(g_tTexcdi4): 145(ptr) Variable UniformConstant
147: TypeImage 37(int) Cube sampled format:Unknown
148: TypePointer UniformConstant 147
149(g_tTexcdu4): 148(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function
@@ -581,7 +576,7 @@ gl_FragCoord origin is upper left
Store 133 132
135: 134(ptr) AccessChain 130(psout) 23
Store 135 131
139:128(PS_OUTPUT) Load 130(psout)
Store 138(@entryPointOutput) 139
138:128(PS_OUTPUT) Load 130(psout)
Store 137(@entryPointOutput) 138
Return
FunctionEnd