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

64
Test/baseResults/hlsl.sample.offset.dx10.frag.out
View File

@@ -139,8 +139,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)
@@ -301,8 +304,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)
@@ -321,13 +327,13 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 147
// Id's are bound by 149
Capability Shader
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main"
EntryPoint Fragment 4 "main" 136
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 9 "txval10"
@@ -353,10 +359,11 @@ gl_FragCoord origin is upper left
MemberName 127(PS_OUTPUT) 0 "Color"
MemberName 127(PS_OUTPUT) 1 "Depth"
Name 129 "psout"
Name 137 "g_tTex1df4a"
Name 140 "g_tTexcdf4"
Name 143 "g_tTexcdi4"
Name 146 "g_tTexcdu4"
Name 136 "@entryPointOutput"
Name 139 "g_tTex1df4a"
Name 142 "g_tTexcdf4"
Name 145 "g_tTexcdi4"
Name 148 "g_tTexcdu4"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0
@@ -370,11 +377,11 @@ gl_FragCoord origin is upper left
Decorate 105(g_tTex3di4) DescriptorSet 0
Decorate 116(g_tTex3du4) DescriptorSet 0
MemberDecorate 127(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 137(g_tTex1df4a) DescriptorSet 0
Decorate 137(g_tTex1df4a) Binding 1
Decorate 140(g_tTexcdf4) DescriptorSet 0
Decorate 143(g_tTexcdi4) DescriptorSet 0
Decorate 146(g_tTexcdu4) DescriptorSet 0
Decorate 139(g_tTex1df4a) DescriptorSet 0
Decorate 139(g_tTex1df4a) Binding 1
Decorate 142(g_tTexcdf4) DescriptorSet 0
Decorate 145(g_tTexcdi4) DescriptorSet 0
Decorate 148(g_tTexcdu4) DescriptorSet 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -458,16 +465,18 @@ gl_FragCoord origin is upper left
130: 6(float) Constant 1065353216
131: 7(fvec4) ConstantComposite 130 130 130 130
133: TypePointer Function 6(float)
137(g_tTex1df4a): 11(ptr) Variable UniformConstant
138: TypeImage 6(float) Cube sampled format:Unknown
139: TypePointer UniformConstant 138
140(g_tTexcdf4): 139(ptr) Variable UniformConstant
141: TypeImage 21(int) Cube sampled format:Unknown
142: TypePointer UniformConstant 141
143(g_tTexcdi4): 142(ptr) Variable UniformConstant
144: TypeImage 36(int) Cube sampled format:Unknown
145: TypePointer UniformConstant 144
146(g_tTexcdu4): 145(ptr) Variable UniformConstant
135: TypePointer Output 127(PS_OUTPUT)
136(@entryPointOutput): 135(ptr) Variable Output
139(g_tTex1df4a): 11(ptr) Variable UniformConstant
140: TypeImage 6(float) Cube sampled format:Unknown
141: TypePointer UniformConstant 140
142(g_tTexcdf4): 141(ptr) Variable UniformConstant
143: TypeImage 21(int) Cube sampled format:Unknown
144: TypePointer UniformConstant 143
145(g_tTexcdi4): 144(ptr) Variable UniformConstant
146: TypeImage 36(int) Cube sampled format:Unknown
147: TypePointer UniformConstant 146
148(g_tTexcdu4): 147(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function
@@ -529,6 +538,7 @@ gl_FragCoord origin is upper left
Store 132 131
134: 133(ptr) AccessChain 129(psout) 22
Store 134 130
135:127(PS_OUTPUT) Load 129(psout)
ReturnValue 135
137:127(PS_OUTPUT) Load 129(psout)
Store 136(@entryPointOutput) 137
Return
FunctionEnd