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

60
Test/baseResults/hlsl.load.2dms.dx10.frag.out
View file

@ -90,7 +90,7 @@ gl_FragCoord origin is upper left
0:52 1.000000
0:54 Sequence
0:54 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:54 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:54 Branch: Return
0:? Linker Objects
@ -205,7 +205,7 @@ gl_FragCoord origin is upper left
0:52 1.000000
0:54 Sequence
0:54 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:54 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:54 Branch: Return
0:? Linker Objects
@ -227,14 +227,14 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 105
// Id's are bound by 106
Capability Shader
Capability ImageGatherExtended
Capability ImageMSArray
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 92
EntryPoint Fragment 4 "main" 93
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 9 "g_tTex2dmsf4"
@ -250,13 +250,16 @@ gl_FragCoord origin is upper left
MemberName 80(PS_OUTPUT) 0 "Color"
MemberName 80(PS_OUTPUT) 1 "Depth"
Name 82 "psout"
Name 92 "@entryPointOutput"
Name 97 "g_sSamp"
Name 99 "c1"
Name 101 "c4"
Name 102 "o1"
Name 103 "o3"
Name 104 "o4"
Name 91 "PS_OUTPUT"
MemberName 91(PS_OUTPUT) 0 "Color"
MemberName 91(PS_OUTPUT) 1 "Depth"
Name 93 "@entryPointOutput"
Name 98 "g_sSamp"
Name 100 "c1"
Name 102 "c4"
Name 103 "o1"
Name 104 "o3"
Name 105 "o4"
Decorate 9(g_tTex2dmsf4) DescriptorSet 0
Decorate 21(g_tTex2dmsi4) DescriptorSet 0
Decorate 29(g_tTex2dmsu4) DescriptorSet 0
@ -264,8 +267,10 @@ gl_FragCoord origin is upper left
Decorate 58(g_tTex2dmsi4a) DescriptorSet 0
Decorate 64(g_tTex2dmsu4a) DescriptorSet 0
MemberDecorate 80(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 97(g_sSamp) DescriptorSet 0
Decorate 97(g_sSamp) Binding 0
MemberDecorate 91(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 93(@entryPointOutput) Location 0
Decorate 98(g_sSamp) DescriptorSet 0
Decorate 98(g_sSamp) Binding 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@ -308,18 +313,19 @@ gl_FragCoord origin is upper left
86: TypePointer Function 17(fvec4)
88: 11(int) Constant 1
89: TypePointer Function 6(float)
91: TypePointer Output 80(PS_OUTPUT)
92(@entryPointOutput): 91(ptr) Variable Output
95: TypeSampler
96: TypePointer UniformConstant 95
97(g_sSamp): 96(ptr) Variable UniformConstant
98: TypePointer UniformConstant 11(int)
99(c1): 98(ptr) Variable UniformConstant
100: TypePointer UniformConstant 24(ivec4)
101(c4): 100(ptr) Variable UniformConstant
102(o1): 98(ptr) Variable UniformConstant
103(o3): 52(ptr) Variable UniformConstant
104(o4): 100(ptr) Variable UniformConstant
91(PS_OUTPUT): TypeStruct 17(fvec4) 6(float)
92: TypePointer Output 91(PS_OUTPUT)
93(@entryPointOutput): 92(ptr) Variable Output
96: TypeSampler
97: TypePointer UniformConstant 96
98(g_sSamp): 97(ptr) Variable UniformConstant
99: TypePointer UniformConstant 11(int)
100(c1): 99(ptr) Variable UniformConstant
101: TypePointer UniformConstant 24(ivec4)
102(c4): 101(ptr) Variable UniformConstant
103(o1): 99(ptr) Variable UniformConstant
104(o3): 52(ptr) Variable UniformConstant
105(o4): 101(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
82(psout): 81(ptr) Variable Function
@ -369,7 +375,7 @@ gl_FragCoord origin is upper left
Store 87 85
90: 89(ptr) AccessChain 82(psout) 88
Store 90 84
93:80(PS_OUTPUT) Load 82(psout)
Store 92(@entryPointOutput) 93
94:80(PS_OUTPUT) Load 82(psout)
Store 93(@entryPointOutput) 94
Return
FunctionEnd