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

38
Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out
View File

@@ -171,7 +171,7 @@ gl_FragCoord origin is upper left
0:49 1.000000
0:51 Sequence
0:51 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:51 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:51 Branch: Return
0:? Linker Objects
@@ -367,7 +367,7 @@ gl_FragCoord origin is upper left
0:49 1.000000
0:51 Sequence
0:51 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:51 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:51 Branch: Return
0:? Linker Objects
@@ -389,13 +389,13 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 160
// Id's are bound by 161
Capability Shader
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 155
EntryPoint Fragment 4 "main" 156
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 9 "txval10"
@@ -427,9 +427,12 @@ gl_FragCoord origin is upper left
MemberName 144(PS_OUTPUT) 0 "Color"
MemberName 144(PS_OUTPUT) 1 "Depth"
Name 146 "psout"
Name 155 "@entryPointOutput"
Name 158 "g_sSamp2d"
Name 159 "g_tTex1df4a"
Name 154 "PS_OUTPUT"
MemberName 154(PS_OUTPUT) 0 "Color"
MemberName 154(PS_OUTPUT) 1 "Depth"
Name 156 "@entryPointOutput"
Name 159 "g_sSamp2d"
Name 160 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0
@@ -446,9 +449,11 @@ gl_FragCoord origin is upper left
Decorate 129(g_tTexcdi4) DescriptorSet 0
Decorate 138(g_tTexcdu4) DescriptorSet 0
MemberDecorate 144(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 158(g_sSamp2d) DescriptorSet 0
Decorate 159(g_tTex1df4a) DescriptorSet 0
Decorate 159(g_tTex1df4a) Binding 1
MemberDecorate 154(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 156(@entryPointOutput) Location 0
Decorate 159(g_sSamp2d) DescriptorSet 0
Decorate 160(g_tTex1df4a) DescriptorSet 0
Decorate 160(g_tTex1df4a) Binding 1
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -536,10 +541,11 @@ gl_FragCoord origin is upper left
149: 7(fvec4) ConstantComposite 148 148 148 148
151: 23(int) Constant 1
152: TypePointer Function 6(float)
154: TypePointer Output 144(PS_OUTPUT)
155(@entryPointOutput): 154(ptr) Variable Output
158(g_sSamp2d): 15(ptr) Variable UniformConstant
159(g_tTex1df4a): 11(ptr) Variable UniformConstant
154(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
155: TypePointer Output 154(PS_OUTPUT)
156(@entryPointOutput): 155(ptr) Variable Output
159(g_sSamp2d): 15(ptr) Variable UniformConstant
160(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function
@@ -619,7 +625,7 @@ gl_FragCoord origin is upper left
Store 150 149
153: 152(ptr) AccessChain 146(psout) 151
Store 153 148
156:144(PS_OUTPUT) Load 146(psout)
Store 155(@entryPointOutput) 156
157:144(PS_OUTPUT) Load 146(psout)
Store 156(@entryPointOutput) 157
Return
FunctionEnd