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

@@ -215,8 +215,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)
@@ -453,8 +456,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)
@@ -473,13 +479,13 @@ Shader version: 450
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 158
// Id's are bound by 160
Capability Shader
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main"
EntryPoint Vertex 4 "main" 156
Name 4 "main"
Name 9 "txval10"
Name 12 "g_tTex1df4"
@@ -509,7 +515,8 @@ Shader version: 450
Name 148 "VS_OUTPUT"
MemberName 148(VS_OUTPUT) 0 "Pos"
Name 150 "vsout"
Name 157 "g_tTex1df4a"
Name 156 "@entryPointOutput"
Name 159 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0
@@ -526,8 +533,8 @@ Shader version: 450
Decorate 133(g_tTexcdi4) DescriptorSet 0
Decorate 142(g_tTexcdu4) DescriptorSet 0
MemberDecorate 148(VS_OUTPUT) 0 BuiltIn FragCoord
Decorate 157(g_tTex1df4a) DescriptorSet 0
Decorate 157(g_tTex1df4a) Binding 1
Decorate 159(g_tTex1df4a) DescriptorSet 0
Decorate 159(g_tTex1df4a) Binding 1
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -617,7 +624,9 @@ Shader version: 450
151: 24(int) Constant 0
152: 6(float) Constant 0
153: 7(fvec4) ConstantComposite 152 152 152 152
157(g_tTex1df4a): 11(ptr) Variable UniformConstant
155: TypePointer Output 148(VS_OUTPUT)
156(@entryPointOutput): 155(ptr) Variable Output
159(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function
@@ -695,6 +704,7 @@ Shader version: 450
Store 139(txval42) 147
154: 8(ptr) AccessChain 150(vsout) 151
Store 154 153
155:148(VS_OUTPUT) Load 150(vsout)
ReturnValue 155
157:148(VS_OUTPUT) Load 150(vsout)
Store 156(@entryPointOutput) 157
Return
FunctionEnd