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 be2f6b05c3
88 changed files with 5121 additions and 4103 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Test/baseResults/hlsl.samplebias.basic.dx10.frag.out
View file

@ -169,8 +169,11 @@ gl_FragCoord origin is upper left
0:48 1 (const int)
0:48 Constant:
0:48 1.000000
0:50 Branch: Return with expression
0:50 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:50 Sequence
0:50 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:50 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:50 Branch: Return
0:? Linker Objects
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D)
@ -361,8 +364,11 @@ gl_FragCoord origin is upper left
0:48 1 (const int)
0:48 Constant:
0:48 1.000000
0:50 Branch: Return with expression
0:50 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:50 Sequence
0:50 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:50 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:50 Branch: Return
0:? Linker Objects
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D)
@ -381,13 +387,13 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 156
// Id's are bound by 158
Capability Shader
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main"
EntryPoint Fragment 4 "main" 154
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 9 "txval10"
@ -419,7 +425,8 @@ gl_FragCoord origin is upper left
MemberName 143(PS_OUTPUT) 0 "Color"
MemberName 143(PS_OUTPUT) 1 "Depth"
Name 145 "psout"
Name 155 "g_tTex1df4a"
Name 154 "@entryPointOutput"
Name 157 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0
@ -436,8 +443,8 @@ gl_FragCoord origin is upper left
Decorate 128(g_tTexcdi4) DescriptorSet 0
Decorate 137(g_tTexcdu4) DescriptorSet 0
MemberDecorate 143(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 155(g_tTex1df4a) DescriptorSet 0
Decorate 155(g_tTex1df4a) Binding 1
Decorate 157(g_tTex1df4a) DescriptorSet 0
Decorate 157(g_tTex1df4a) Binding 1
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@ -524,7 +531,9 @@ gl_FragCoord origin is upper left
148: 7(fvec4) ConstantComposite 147 147 147 147
150: 23(int) Constant 1
151: TypePointer Function 6(float)
155(g_tTex1df4a): 11(ptr) Variable UniformConstant
153: TypePointer Output 143(PS_OUTPUT)
154(@entryPointOutput): 153(ptr) Variable Output
157(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function
@ -604,6 +613,7 @@ gl_FragCoord origin is upper left
Store 149 148
152: 151(ptr) AccessChain 145(psout) 150
Store 152 147
153:143(PS_OUTPUT) Load 145(psout)
ReturnValue 153
155:143(PS_OUTPUT) Load 145(psout)
Store 154(@entryPointOutput) 155
Return
FunctionEnd