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

32
Test/baseResults/hlsl.samplebias.basic.dx10.frag.out
View File

@@ -171,7 +171,7 @@ gl_FragCoord origin is upper left
0:48 1.000000
0:50 Sequence
0:50 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:50 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:50 Branch: Return
0:? Linker Objects
@@ -366,7 +366,7 @@ gl_FragCoord origin is upper left
0:48 1.000000
0:50 Sequence
0:50 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:50 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:50 Branch: Return
0:? Linker Objects
@@ -387,13 +387,13 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 158
// Id's are bound by 159
Capability Shader
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 154
EntryPoint Fragment 4 "main" 155
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 9 "txval10"
@@ -425,8 +425,11 @@ gl_FragCoord origin is upper left
MemberName 143(PS_OUTPUT) 0 "Color"
MemberName 143(PS_OUTPUT) 1 "Depth"
Name 145 "psout"
Name 154 "@entryPointOutput"
Name 157 "g_tTex1df4a"
Name 153 "PS_OUTPUT"
MemberName 153(PS_OUTPUT) 0 "Color"
MemberName 153(PS_OUTPUT) 1 "Depth"
Name 155 "@entryPointOutput"
Name 158 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0
@@ -443,8 +446,10 @@ gl_FragCoord origin is upper left
Decorate 128(g_tTexcdi4) DescriptorSet 0
Decorate 137(g_tTexcdu4) DescriptorSet 0
MemberDecorate 143(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 157(g_tTex1df4a) DescriptorSet 0
Decorate 157(g_tTex1df4a) Binding 1
MemberDecorate 153(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 155(@entryPointOutput) Location 0
Decorate 158(g_tTex1df4a) DescriptorSet 0
Decorate 158(g_tTex1df4a) Binding 1
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -531,9 +536,10 @@ gl_FragCoord origin is upper left
148: 7(fvec4) ConstantComposite 147 147 147 147
150: 23(int) Constant 1
151: TypePointer Function 6(float)
153: TypePointer Output 143(PS_OUTPUT)
154(@entryPointOutput): 153(ptr) Variable Output
157(g_tTex1df4a): 11(ptr) Variable UniformConstant
153(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
154: TypePointer Output 153(PS_OUTPUT)
155(@entryPointOutput): 154(ptr) Variable Output
158(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function
@@ -613,7 +619,7 @@ gl_FragCoord origin is upper left
Store 149 148
152: 151(ptr) AccessChain 145(psout) 150
Store 152 147
155:143(PS_OUTPUT) Load 145(psout)
Store 154(@entryPointOutput) 155
156:143(PS_OUTPUT) Load 145(psout)
Store 155(@entryPointOutput) 156
Return
FunctionEnd