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

64
Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out
View file

@ -193,8 +193,11 @@ gl_FragCoord origin is upper left
0:46 1 (const int)
0:46 Constant:
0:46 1.000000
0:48 Branch: Return with expression
0:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:48 Sequence
0:48 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:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:48 Branch: Return
0:? Linker Objects
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D)
@ -409,8 +412,11 @@ gl_FragCoord origin is upper left
0:46 1 (const int)
0:46 Constant:
0:46 1.000000
0:48 Branch: Return with expression
0:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:48 Sequence
0:48 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:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:48 Branch: Return
0:? Linker Objects
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D)
@ -429,13 +435,13 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 152
// Id's are bound by 154
Capability Shader
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main"
EntryPoint Fragment 4 "main" 141
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 9 "txval10"
@ -461,10 +467,11 @@ gl_FragCoord origin is upper left
MemberName 132(PS_OUTPUT) 0 "Color"
MemberName 132(PS_OUTPUT) 1 "Depth"
Name 134 "psout"
Name 142 "g_tTex1df4a"
Name 145 "g_tTexcdf4"
Name 148 "g_tTexcdi4"
Name 151 "g_tTexcdu4"
Name 141 "@entryPointOutput"
Name 144 "g_tTex1df4a"
Name 147 "g_tTexcdf4"
Name 150 "g_tTexcdi4"
Name 153 "g_tTexcdu4"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0
@ -478,11 +485,11 @@ gl_FragCoord origin is upper left
Decorate 110(g_tTex3di4) DescriptorSet 0
Decorate 121(g_tTex3du4) DescriptorSet 0
MemberDecorate 132(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 142(g_tTex1df4a) DescriptorSet 0
Decorate 142(g_tTex1df4a) Binding 1
Decorate 145(g_tTexcdf4) DescriptorSet 0
Decorate 148(g_tTexcdi4) DescriptorSet 0
Decorate 151(g_tTexcdu4) DescriptorSet 0
Decorate 144(g_tTex1df4a) DescriptorSet 0
Decorate 144(g_tTex1df4a) Binding 1
Decorate 147(g_tTexcdf4) DescriptorSet 0
Decorate 150(g_tTexcdi4) DescriptorSet 0
Decorate 153(g_tTexcdu4) DescriptorSet 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@ -571,16 +578,18 @@ gl_FragCoord origin is upper left
135: 6(float) Constant 1065353216
136: 7(fvec4) ConstantComposite 135 135 135 135
138: TypePointer Function 6(float)
142(g_tTex1df4a): 11(ptr) Variable UniformConstant
143: TypeImage 6(float) Cube sampled format:Unknown
144: TypePointer UniformConstant 143
145(g_tTexcdf4): 144(ptr) Variable UniformConstant
146: TypeImage 23(int) Cube sampled format:Unknown
147: TypePointer UniformConstant 146
148(g_tTexcdi4): 147(ptr) Variable UniformConstant
149: TypeImage 38(int) Cube sampled format:Unknown
150: TypePointer UniformConstant 149
151(g_tTexcdu4): 150(ptr) Variable UniformConstant
140: TypePointer Output 132(PS_OUTPUT)
141(@entryPointOutput): 140(ptr) Variable Output
144(g_tTex1df4a): 11(ptr) Variable UniformConstant
145: TypeImage 6(float) Cube sampled format:Unknown
146: TypePointer UniformConstant 145
147(g_tTexcdf4): 146(ptr) Variable UniformConstant
148: TypeImage 23(int) Cube sampled format:Unknown
149: TypePointer UniformConstant 148
150(g_tTexcdi4): 149(ptr) Variable UniformConstant
151: TypeImage 38(int) Cube sampled format:Unknown
152: TypePointer UniformConstant 151
153(g_tTexcdu4): 152(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function
@ -642,6 +651,7 @@ gl_FragCoord origin is upper left
Store 137 136
139: 138(ptr) AccessChain 134(psout) 24
Store 139 135
140:132(PS_OUTPUT) Load 134(psout)
ReturnValue 140
142:132(PS_OUTPUT) Load 134(psout)
Store 141(@entryPointOutput) 142
Return
FunctionEnd