Conor McCarthy : vkd3d-shader/spirv: Support bool source in spirv_compiler_emit_discard().

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 8d947ce8683a9b4afc0012347d31d2156676c54e
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/8d947ce8683a9b4afc0012347d31d2...

Author: Conor McCarthy <cmccarthy(a)codeweavers.com>
Date:   Wed Mar 20 14:53:15 2024 +1000

vkd3d-shader/spirv: Support bool source in spirv_compiler_emit_discard().

---

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

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index ede7c623..46130244 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -8007,8 +8007,9 @@ static void spirv_compiler_emit_discard(struct spirv_compiler *compiler,
      * a mismatch between the VSIR structure and the SPIR-V one, which would cause problems if
      * structurisation is necessary. Therefore we emit it as a function call. */
     condition_id = spirv_compiler_emit_load_src(compiler, src, VKD3DSP_WRITEMASK_0);
-    condition_id = spirv_compiler_emit_int_to_bool(compiler,
-            instruction->flags, src->reg.data_type, 1, condition_id);
+    if (src->reg.data_type != VKD3D_DATA_BOOL)
+        condition_id = spirv_compiler_emit_int_to_bool(compiler,
+                instruction->flags, src->reg.data_type, 1, condition_id);
     void_id = vkd3d_spirv_get_op_type_void(builder);
     vkd3d_spirv_build_op_function_call(builder, void_id, spirv_compiler_get_discard_function_id(compiler),
             &condition_id, 1);