[PATCH v2 06/10] vkd3d-shader/spirv: Support bitcast in spirv_compiler_emit_load_ssa_reg().

[Conor McCarthy]

From: Conor McCarthy

---
 libs/vkd3d-shader/dxil.c                 |  1 +
 libs/vkd3d-shader/spirv.c                | 10 ++++++++++
 libs/vkd3d-shader/vkd3d_shader_private.h |  1 +
 3 files changed, 12 insertions(+)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index 63c58db72..467aae52a 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -1937,6 +1937,7 @@ static void register_init_ssa_vector(struct vkd3d_shader_register *reg, const st
     id = sm6_parser_alloc_ssa_id(sm6);
     data_type = vkd3d_data_type_from_sm6_type(sm6_type_get_scalar_type(type, 0));
     register_init_with_id(reg, VKD3DSPR_SSA, data_type, id);
+    reg->u.ssa_data_type = data_type;
     reg->dimension = component_count > 1 ? VSIR_DIMENSION_VEC4 : VSIR_DIMENSION_SCALAR;
 }

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index d48ac7999..f540fda10 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -3751,6 +3751,7 @@ static uint32_t spirv_compiler_emit_load_ssa_reg(struct spirv_compiler *compiler
         unsigned int swizzle)
 {
     struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
+    enum vkd3d_shader_component_type reg_component_type;
     unsigned int component_idx;
     uint32_t type_id, val_id;

@@ -3759,7 +3760,16 @@ static uint32_t spirv_compiler_emit_load_ssa_reg(struct spirv_compiler *compiler
     assert(vkd3d_swizzle_is_scalar(swizzle));

if (reg->dimension == VSIR_DIMENSION_SCALAR)
+    {
+        reg_component_type = vkd3d_component_type_from_data_type(reg->u.ssa_data_type);
+        if (component_type != reg_component_type)
+        {
+            type_id = vkd3d_spirv_get_type_id(builder, component_type, 1);
+            val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id);
+        }
+
         return val_id;
+    }

type_id = vkd3d_spirv_get_type_id(builder, component_type, 1);
     component_idx = vkd3d_swizzle_get_component(swizzle, 0);
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index 045575c8e..07e92cadf 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -803,6 +803,7 @@ struct vkd3d_shader_register
         uint64_t immconst_uint64[VKD3D_DVEC2_SIZE];
         double immconst_double[VKD3D_DVEC2_SIZE];
         unsigned fp_body_idx;
+        enum vkd3d_data_type ssa_data_type;
     } u;
 };