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

@@ -114,7 +114,7 @@ gl_FragCoord origin is upper left
0:34 1.000000
0:36 Sequence
0:36 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:36 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:36 Branch: Return
0:? Linker Objects
@@ -246,7 +246,7 @@ gl_FragCoord origin is upper left
0:34 1.000000
0:36 Sequence
0:36 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:36 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:36 Branch: Return
0:? Linker Objects
@@ -261,13 +261,13 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 106
// Id's are bound by 107
Capability Shader
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 102
EntryPoint Fragment 4 "main" 103
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 9 "txval10"
@@ -287,8 +287,11 @@ gl_FragCoord origin is upper left
MemberName 93(PS_OUTPUT) 0 "Color"
MemberName 93(PS_OUTPUT) 1 "Depth"
Name 95 "psout"
Name 102 "@entryPointOutput"
Name 105 "g_tTex1df4a"
Name 101 "PS_OUTPUT"
MemberName 101(PS_OUTPUT) 0 "Color"
MemberName 101(PS_OUTPUT) 1 "Depth"
Name 103 "@entryPointOutput"
Name 106 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0
@@ -299,8 +302,10 @@ gl_FragCoord origin is upper left
Decorate 73(g_tTex2di4) DescriptorSet 0
Decorate 83(g_tTex2du4) DescriptorSet 0
MemberDecorate 93(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 105(g_tTex1df4a) DescriptorSet 0
Decorate 105(g_tTex1df4a) Binding 1
MemberDecorate 101(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 103(@entryPointOutput) Location 0
Decorate 106(g_tTex1df4a) DescriptorSet 0
Decorate 106(g_tTex1df4a) Binding 1
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -365,9 +370,10 @@ gl_FragCoord origin is upper left
96: 6(float) Constant 1065353216
97: 7(fvec4) ConstantComposite 96 96 96 96
99: TypePointer Function 6(float)
101: TypePointer Output 93(PS_OUTPUT)
102(@entryPointOutput): 101(ptr) Variable Output
105(g_tTex1df4a): 11(ptr) Variable UniformConstant
101(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
102: TypePointer Output 101(PS_OUTPUT)
103(@entryPointOutput): 102(ptr) Variable Output
106(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function
@@ -411,7 +417,7 @@ gl_FragCoord origin is upper left
Store 98 97
100: 99(ptr) AccessChain 95(psout) 40
Store 100 96
103:93(PS_OUTPUT) Load 95(psout)
Store 102(@entryPointOutput) 103
104:93(PS_OUTPUT) Load 95(psout)
Store 103(@entryPointOutput) 104
Return
FunctionEnd