mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

34
Test/baseResults/hlsl.samplebias.array.dx10.frag.out
View File

@@ -139,8 +139,11 @@ gl_FragCoord origin is upper left
0:40 1 (const int)
0:40 Constant:
0:40 1.000000
0:42 Branch: Return with expression
0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:42 Sequence
0:42 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:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:42 Branch: Return
0:? Linker Objects
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray)
@@ -298,8 +301,11 @@ gl_FragCoord origin is upper left
0:40 1 (const int)
0:40 Constant:
0:40 1.000000
0:42 Branch: Return with expression
0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:42 Sequence
0:42 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:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:42 Branch: Return
0:? Linker Objects
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray)
@@ -315,14 +321,14 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 132
// Id's are bound by 134
Capability Shader
Capability Sampled1D
Capability SampledCubeArray
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main"
EntryPoint Fragment 4 "main" 130
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 9 "txval10"
@@ -348,7 +354,8 @@ gl_FragCoord origin is upper left
MemberName 120(PS_OUTPUT) 0 "Color"
MemberName 120(PS_OUTPUT) 1 "Depth"
Name 122 "psout"
Name 131 "g_tTex1df4a"
Name 130 "@entryPointOutput"
Name 133 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0
@@ -362,8 +369,8 @@ gl_FragCoord origin is upper left
Decorate 100(g_tTexcdi4) DescriptorSet 0
Decorate 110(g_tTexcdu4) DescriptorSet 0
MemberDecorate 120(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 131(g_tTex1df4a) DescriptorSet 0
Decorate 131(g_tTex1df4a) Binding 1
Decorate 133(g_tTex1df4a) DescriptorSet 0
Decorate 133(g_tTex1df4a) Binding 1
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -441,7 +448,9 @@ gl_FragCoord origin is upper left
124: 7(fvec4) ConstantComposite 117 117 117 117
126: 26(int) Constant 1
127: TypePointer Function 6(float)
131(g_tTex1df4a): 11(ptr) Variable UniformConstant
129: TypePointer Output 120(PS_OUTPUT)
130(@entryPointOutput): 129(ptr) Variable Output
133(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function
@@ -503,6 +512,7 @@ gl_FragCoord origin is upper left
Store 125 124
128: 127(ptr) AccessChain 122(psout) 126
Store 128 117
129:120(PS_OUTPUT) Load 122(psout)
ReturnValue 129
131:120(PS_OUTPUT) Load 122(psout)
Store 130(@entryPointOutput) 131
Return
FunctionEnd