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

HLSL: Emulate write-to-output on return-from-entry-point, for return value.

Browse source 
This fixes issue #487 and #480.
It also correctly handles output parameters from the entry point.
This commit is contained in:
John Kessenich 2016-08-28 15:00:23 -06:00
parent 81cd764b5f
commit 6a70eb7161
91 changed files with 5158 additions and 4130 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out
View file

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