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

HLSL: Start location numbering with the entry-point return value.

Browse Source 
Also, increment location numbers by the size of the objects.
This commit is contained in:
John Kessenich
2016-08-29 18:10:47 -06:00
parent a05d8b5604
commit 830b0cc98b
89 changed files with 2517 additions and 2157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out
View File

@@ -163,7 +163,7 @@ Shader version: 450
0:? 0.000000
0:48 Sequence
0:48 move second child to first child (temp structure{temp 4-component vector of float Position Pos})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float Position Pos})
0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Position Pos})
0:48 'vsout' (temp structure{temp 4-component vector of float Position Pos})
0:48 Branch: Return
0:? Linker Objects
@@ -350,7 +350,7 @@ Shader version: 450
0:? 0.000000
0:48 Sequence
0:48 move second child to first child (temp structure{temp 4-component vector of float Position Pos})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float Position Pos})
0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Position Pos})
0:48 'vsout' (temp structure{temp 4-component vector of float Position Pos})
0:48 Branch: Return
0:? Linker Objects
@@ -371,13 +371,13 @@ Shader version: 450
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 156
// Id's are bound by 157
Capability Shader
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 152
EntryPoint Vertex 4 "main" 153
Name 4 "main"
Name 9 "txval10"
Name 12 "g_tTex1df4"
@@ -407,8 +407,10 @@ Shader version: 450
Name 144 "VS_OUTPUT"
MemberName 144(VS_OUTPUT) 0 "Pos"
Name 146 "vsout"
Name 152 "@entryPointOutput"
Name 155 "g_tTex1df4a"
Name 151 "VS_OUTPUT"
MemberName 151(VS_OUTPUT) 0 "Pos"
Name 153 "@entryPointOutput"
Name 156 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0
@@ -425,8 +427,10 @@ Shader version: 450
Decorate 129(g_tTexcdi4) DescriptorSet 0
Decorate 138(g_tTexcdu4) DescriptorSet 0
MemberDecorate 144(VS_OUTPUT) 0 BuiltIn Position
Decorate 155(g_tTex1df4a) DescriptorSet 0
Decorate 155(g_tTex1df4a) Binding 1
MemberDecorate 151(VS_OUTPUT) 0 BuiltIn Position
Decorate 153(@entryPointOutput) Location 0
Decorate 156(g_tTex1df4a) DescriptorSet 0
Decorate 156(g_tTex1df4a) Binding 1
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -512,9 +516,10 @@ Shader version: 450
147: 23(int) Constant 0
148: 6(float) Constant 0
149: 7(fvec4) ConstantComposite 148 148 148 148
151: TypePointer Output 144(VS_OUTPUT)
152(@entryPointOutput): 151(ptr) Variable Output
155(g_tTex1df4a): 11(ptr) Variable UniformConstant
151(VS_OUTPUT): TypeStruct 7(fvec4)
152: TypePointer Output 151(VS_OUTPUT)
153(@entryPointOutput): 152(ptr) Variable Output
156(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function
@@ -592,7 +597,7 @@ Shader version: 450
Store 135(txval42) 143
150: 8(ptr) AccessChain 146(vsout) 147
Store 150 149
153:144(VS_OUTPUT) Load 146(vsout)
Store 152(@entryPointOutput) 153
154:144(VS_OUTPUT) Load 146(vsout)
Store 153(@entryPointOutput) 154
Return
FunctionEnd