BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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.samplelevel.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 107
// Id's are bound by 108
Capability Shader
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 103
EntryPoint Fragment 4 "main" 104
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 9 "txval10"
@ -287,8 +287,11 @@ gl_FragCoord origin is upper left
MemberName 94(PS_OUTPUT) 0 "Color"
MemberName 94(PS_OUTPUT) 1 "Depth"
Name 96 "psout"
Name 103 "@entryPointOutput"
Name 106 "g_tTex1df4a"
Name 102 "PS_OUTPUT"
MemberName 102(PS_OUTPUT) 0 "Color"
MemberName 102(PS_OUTPUT) 1 "Depth"
Name 104 "@entryPointOutput"
Name 107 "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 84(g_tTex2du4) DescriptorSet 0
MemberDecorate 94(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 106(g_tTex1df4a) DescriptorSet 0
Decorate 106(g_tTex1df4a) Binding 1
MemberDecorate 102(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 104(@entryPointOutput) Location 0
Decorate 107(g_tTex1df4a) DescriptorSet 0
Decorate 107(g_tTex1df4a) Binding 1
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@ -366,9 +371,10 @@ gl_FragCoord origin is upper left
97: 6(float) Constant 1065353216
98: 7(fvec4) ConstantComposite 97 97 97 97
100: TypePointer Function 6(float)
102: TypePointer Output 94(PS_OUTPUT)
103(@entryPointOutput): 102(ptr) Variable Output
106(g_tTex1df4a): 11(ptr) Variable UniformConstant
102(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
103: TypePointer Output 102(PS_OUTPUT)
104(@entryPointOutput): 103(ptr) Variable Output
107(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function
@ -412,7 +418,7 @@ gl_FragCoord origin is upper left
Store 99 98
101: 100(ptr) AccessChain 96(psout) 40
Store 101 97
104:94(PS_OUTPUT) Load 96(psout)
Store 103(@entryPointOutput) 104
105:94(PS_OUTPUT) Load 96(psout)
Store 104(@entryPointOutput) 105
Return
FunctionEnd