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.samplelevel.basic.dx10.vert.out
View File

@@ -161,8 +161,11 @@ Shader version: 450
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:48 Branch: Return with expression
0:48 'vsout' (temp structure{temp 4-component vector of float FragCoord Pos})
0:48 Sequence
0:48 move second child to first child (temp structure{temp 4-component vector of float FragCoord Pos})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float FragCoord Pos})
0:48 'vsout' (temp structure{temp 4-component vector of float FragCoord Pos})
0:48 Branch: Return
0:? Linker Objects
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D)
@@ -345,8 +348,11 @@ Shader version: 450
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:48 Branch: Return with expression
0:48 'vsout' (temp structure{temp 4-component vector of float FragCoord Pos})
0:48 Sequence
0:48 move second child to first child (temp structure{temp 4-component vector of float FragCoord Pos})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float FragCoord Pos})
0:48 'vsout' (temp structure{temp 4-component vector of float FragCoord Pos})
0:48 Branch: Return
0:? Linker Objects
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D)
@@ -365,13 +371,13 @@ Shader version: 450
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 154
// Id's are bound by 156
Capability Shader
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main"
EntryPoint Vertex 4 "main" 152
Name 4 "main"
Name 9 "txval10"
Name 12 "g_tTex1df4"
@@ -401,7 +407,8 @@ Shader version: 450
Name 144 "VS_OUTPUT"
MemberName 144(VS_OUTPUT) 0 "Pos"
Name 146 "vsout"
Name 153 "g_tTex1df4a"
Name 152 "@entryPointOutput"
Name 155 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0
@@ -418,8 +425,8 @@ Shader version: 450
Decorate 129(g_tTexcdi4) DescriptorSet 0
Decorate 138(g_tTexcdu4) DescriptorSet 0
MemberDecorate 144(VS_OUTPUT) 0 BuiltIn FragCoord
Decorate 153(g_tTex1df4a) DescriptorSet 0
Decorate 153(g_tTex1df4a) Binding 1
Decorate 155(g_tTex1df4a) DescriptorSet 0
Decorate 155(g_tTex1df4a) Binding 1
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -505,7 +512,9 @@ Shader version: 450
147: 23(int) Constant 0
148: 6(float) Constant 0
149: 7(fvec4) ConstantComposite 148 148 148 148
153(g_tTex1df4a): 11(ptr) Variable UniformConstant
151: TypePointer Output 144(VS_OUTPUT)
152(@entryPointOutput): 151(ptr) Variable Output
155(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function
@@ -583,6 +592,7 @@ Shader version: 450
Store 135(txval42) 143
150: 8(ptr) AccessChain 146(vsout) 147
Store 150 149
151:144(VS_OUTPUT) Load 146(vsout)
ReturnValue 151
153:144(VS_OUTPUT) Load 146(vsout)
Store 152(@entryPointOutput) 153
Return
FunctionEnd