=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: libs/vkd3d-shader: Do not emit output setup for ret in geometry shaders.

Alexandre Julliard julliard at winehq.org
Tue Jun 26 15:01:10 CDT 2018


Module: vkd3d
Branch: master
Commit: d14f9196f92049f8b124df6466b6e8facc092fd7
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=d14f9196f92049f8b124df6466b6e8facc092fd7

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Tue Jun 26 14:41:50 2018 +0200

libs/vkd3d-shader: Do not emit output setup for ret in geometry shaders.

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 libs/vkd3d-shader/spirv.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 1961ba6..a5e51c9 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -4541,7 +4541,8 @@ static void vkd3d_dxbc_compiler_emit_return(struct vkd3d_dxbc_compiler *compiler
 {
     struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
 
-    vkd3d_dxbc_compiler_emit_output_setup_invocation(compiler);
+    if (compiler->shader_type != VKD3D_SHADER_TYPE_GEOMETRY)
+        vkd3d_dxbc_compiler_emit_output_setup_invocation(compiler);
     vkd3d_spirv_build_op_return(builder);
 }
 




More information about the wine-cvs mailing list