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

46
Test/baseResults/hlsl.sample.basic.dx10.frag.out
View file

@ -231,8 +231,11 @@ gl_FragCoord origin is upper left
0:87 1 (const int)
0:87 Constant:
0:87 1.000000
0:89 Branch: Return with expression
0:89 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:89 Sequence
0:89 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:89 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:89 Branch: Return
0:? Linker Objects
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
0:? 'g_sSamp2d' (uniform sampler)
@ -485,8 +488,11 @@ gl_FragCoord origin is upper left
0:87 1 (const int)
0:87 Constant:
0:87 1.000000
0:89 Branch: Return with expression
0:89 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:89 Sequence
0:89 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:89 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:89 Branch: Return
0:? Linker Objects
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
0:? 'g_sSamp2d' (uniform sampler)
@ -507,13 +513,13 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 184
// Id's are bound by 186
Capability Shader
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main"
EntryPoint Fragment 4 "main" 180
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 7 "MemberTest"
@ -559,9 +565,10 @@ gl_FragCoord origin is upper left
MemberName 171(PS_OUTPUT) 0 "Color"
MemberName 171(PS_OUTPUT) 1 "Depth"
Name 173 "psout"
Name 181 "g_sSamp2d"
Name 182 "g_sSamp2D_b"
Name 183 "g_tTex1df4a"
Name 180 "@entryPointOutput"
Name 183 "g_sSamp2d"
Name 184 "g_sSamp2D_b"
Name 185 "g_tTex1df4a"
Decorate 41(g_tTex1df4) DescriptorSet 0
Decorate 41(g_tTex1df4) Binding 0
Decorate 45(g_sSamp) DescriptorSet 0
@ -578,10 +585,10 @@ gl_FragCoord origin is upper left
Decorate 156(g_tTexcdi4) DescriptorSet 0
Decorate 165(g_tTexcdu4) DescriptorSet 0
MemberDecorate 171(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 181(g_sSamp2d) DescriptorSet 0
Decorate 182(g_sSamp2D_b) DescriptorSet 0
Decorate 183(g_tTex1df4a) DescriptorSet 0
Decorate 183(g_tTex1df4a) Binding 1
Decorate 183(g_sSamp2d) DescriptorSet 0
Decorate 184(g_sSamp2D_b) DescriptorSet 0
Decorate 185(g_tTex1df4a) DescriptorSet 0
Decorate 185(g_tTex1df4a) Binding 1
2: TypeVoid
3: TypeFunction 2
6: TypeInt 32 1
@ -681,9 +688,11 @@ gl_FragCoord origin is upper left
174: 35(float) Constant 1065353216
175: 36(fvec4) ConstantComposite 174 174 174 174
177: TypePointer Function 35(float)
181(g_sSamp2d): 44(ptr) Variable UniformConstant
182(g_sSamp2D_b): 44(ptr) Variable UniformConstant
183(g_tTex1df4a): 40(ptr) Variable UniformConstant
179: TypePointer Output 171(PS_OUTPUT)
180(@entryPointOutput): 179(ptr) Variable Output
183(g_sSamp2d): 44(ptr) Variable UniformConstant
184(g_sSamp2D_b): 44(ptr) Variable UniformConstant
185(g_tTex1df4a): 40(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(mtest): 8(ptr) Variable Function
@ -788,6 +797,7 @@ gl_FragCoord origin is upper left
Store 176 175
178: 177(ptr) AccessChain 173(psout) 10
Store 178 174
179:171(PS_OUTPUT) Load 173(psout)
ReturnValue 179
181:171(PS_OUTPUT) Load 173(psout)
Store 180(@entryPointOutput) 181
Return
FunctionEnd