Conor McCarthy : vkd3d-shader/spirv: Emit a vector bitcast if necessary in spirv_compiler_emit_load_ssa_reg().

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 95e4222cc65a23d842245a38fb6b0cb46cffcf04
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/95e4222cc65a23d842245a38fb6b0c...

Author: Conor McCarthy <cmccarthy(a)codeweavers.com>
Date:   Thu Jan 25 13:32:29 2024 +1000

vkd3d-shader/spirv: Emit a vector bitcast if necessary in spirv_compiler_emit_load_ssa_reg().

---

 libs/vkd3d-shader/spirv.c                 | 11 ++++++++++-
 tests/hlsl/texture-load-typed.shader_test |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 755758ce..d4333e6d 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -3884,9 +3884,10 @@ static uint32_t spirv_compiler_emit_load_ssa_reg(struct spirv_compiler *compiler
     }
     assert(vkd3d_swizzle_is_scalar(swizzle, reg));
 
+    reg_component_type = vkd3d_component_type_from_data_type(ssa->data_type);
+
     if (reg->dimension == VSIR_DIMENSION_SCALAR)
     {
-        reg_component_type = vkd3d_component_type_from_data_type(ssa->data_type);
         if (component_type != reg_component_type)
         {
             type_id = vkd3d_spirv_get_type_id(builder, component_type, 1);
@@ -3896,6 +3897,14 @@ static uint32_t spirv_compiler_emit_load_ssa_reg(struct spirv_compiler *compiler
         return val_id;
     }
 
+    if (component_type != reg_component_type)
+    {
+        /* Required for resource loads with sampled type int, because DXIL has no signedness.
+         * Only 128-bit vector sizes are used. */
+        type_id = vkd3d_spirv_get_type_id(builder, component_type, VKD3D_VEC4_SIZE);
+        val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id);
+    }
+
     type_id = vkd3d_spirv_get_type_id(builder, component_type, 1);
     component_idx = vsir_swizzle_get_component(swizzle, 0);
     return vkd3d_spirv_build_op_composite_extract1(builder, type_id, val_id, component_idx);
diff --git a/tests/hlsl/texture-load-typed.shader_test b/tests/hlsl/texture-load-typed.shader_test
index 67a13f10..736b4ae1 100644
--- a/tests/hlsl/texture-load-typed.shader_test
+++ b/tests/hlsl/texture-load-typed.shader_test
@@ -48,7 +48,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(sm>=6) draw quad
+draw quad
 probe all rgba (0.8, -3.0, 4294967295.0, 123.0)
 
 % lowercase 'texture2D'