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

28
Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out
View File

@@ -479,13 +479,13 @@ Shader version: 450
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 161
// Id's are bound by 160
Capability Shader
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 157
EntryPoint Vertex 4 "main" 156
Name 4 "main"
Name 9 "txval10"
Name 12 "g_tTex1df4"
@@ -515,10 +515,8 @@ Shader version: 450
Name 148 "VS_OUTPUT"
MemberName 148(VS_OUTPUT) 0 "Pos"
Name 150 "vsout"
Name 155 "VS_OUTPUT"
MemberName 155(VS_OUTPUT) 0 "Pos"
Name 157 "@entryPointOutput"
Name 160 "g_tTex1df4a"
Name 156 "@entryPointOutput"
Name 159 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0
@@ -535,10 +533,9 @@ Shader version: 450
Decorate 133(g_tTexcdi4) DescriptorSet 0
Decorate 142(g_tTexcdu4) DescriptorSet 0
MemberDecorate 148(VS_OUTPUT) 0 BuiltIn Position
MemberDecorate 155(VS_OUTPUT) 0 BuiltIn Position
Decorate 157(@entryPointOutput) Location 0
Decorate 160(g_tTex1df4a) DescriptorSet 0
Decorate 160(g_tTex1df4a) Binding 1
Decorate 156(@entryPointOutput) Location 0
Decorate 159(g_tTex1df4a) DescriptorSet 0
Decorate 159(g_tTex1df4a) Binding 1
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -628,10 +625,9 @@ Shader version: 450
151: 24(int) Constant 0
152: 6(float) Constant 0
153: 7(fvec4) ConstantComposite 152 152 152 152
155(VS_OUTPUT): TypeStruct 7(fvec4)
156: TypePointer Output 155(VS_OUTPUT)
157(@entryPointOutput): 156(ptr) Variable Output
160(g_tTex1df4a): 11(ptr) Variable UniformConstant
155: TypePointer Output 148(VS_OUTPUT)
156(@entryPointOutput): 155(ptr) Variable Output
159(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function
@@ -709,7 +705,7 @@ Shader version: 450
Store 139(txval42) 147
154: 8(ptr) AccessChain 150(vsout) 151
Store 154 153
158:148(VS_OUTPUT) Load 150(vsout)
Store 157(@entryPointOutput) 158
157:148(VS_OUTPUT) Load 150(vsout)
Store 156(@entryPointOutput) 157
Return
FunctionEnd