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.samplegrad.basic.dx10.frag.out
View File

@@ -225,7 +225,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
@@ -474,7 +474,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
@@ -495,13 +495,13 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 163
// Id's are bound by 164
Capability Shader
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 159
EntryPoint Fragment 4 "main" 160
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 9 "txval10"
@@ -533,8 +533,11 @@ gl_FragCoord origin is upper left
MemberName 148(PS_OUTPUT) 0 "Color"
MemberName 148(PS_OUTPUT) 1 "Depth"
Name 150 "psout"
Name 159 "@entryPointOutput"
Name 162 "g_tTex1df4a"
Name 158 "PS_OUTPUT"
MemberName 158(PS_OUTPUT) 0 "Color"
MemberName 158(PS_OUTPUT) 1 "Depth"
Name 160 "@entryPointOutput"
Name 163 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0
@@ -551,8 +554,10 @@ gl_FragCoord origin is upper left
Decorate 133(g_tTexcdi4) DescriptorSet 0
Decorate 142(g_tTexcdu4) DescriptorSet 0
MemberDecorate 148(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 162(g_tTex1df4a) DescriptorSet 0
Decorate 162(g_tTex1df4a) Binding 1
MemberDecorate 158(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 160(@entryPointOutput) Location 0
Decorate 163(g_tTex1df4a) DescriptorSet 0
Decorate 163(g_tTex1df4a) Binding 1
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -644,9 +649,10 @@ gl_FragCoord origin is upper left
153: 7(fvec4) ConstantComposite 152 152 152 152
155: 24(int) Constant 1
156: TypePointer Function 6(float)
158: TypePointer Output 148(PS_OUTPUT)
159(@entryPointOutput): 158(ptr) Variable Output
162(g_tTex1df4a): 11(ptr) Variable UniformConstant
158(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
159: TypePointer Output 158(PS_OUTPUT)
160(@entryPointOutput): 159(ptr) Variable Output
163(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function
@@ -726,7 +732,7 @@ gl_FragCoord origin is upper left
Store 154 153
157: 156(ptr) AccessChain 150(psout) 155
Store 157 152
160:148(PS_OUTPUT) Load 150(psout)
Store 159(@entryPointOutput) 160
161:148(PS_OUTPUT) Load 150(psout)
Store 160(@entryPointOutput) 161
Return
FunctionEnd