From f02405350ead079d143b18deb52ed56aebd04ec1 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Tue, 22 Jul 2025 21:02:23 +0200 Subject: [PATCH] vkd3d-shader/ir: Consistently use VSIR_DATA_U32 for resinfo_uint destination operands. Much like we do for sample_info_uint. --- libs/vkd3d-shader/spirv.c | 17 ++++------------- libs/vkd3d-shader/tpf.c | 3 ++- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index b6ebffe77..b80cabdb0 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9922,11 +9922,11 @@ static void spirv_compiler_emit_bufinfo(struct spirv_compiler *compiler, static void spirv_compiler_emit_resinfo(struct spirv_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { + enum vkd3d_shader_component_type component_type = VKD3D_SHADER_COMPONENT_UINT; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; uint32_t type_id, lod_id, val_id, miplevel_count_id; - enum vkd3d_shader_component_type component_type; uint32_t constituents[VKD3D_VEC4_SIZE]; unsigned int i, size_component_count; struct vkd3d_shader_image image; @@ -9967,19 +9967,10 @@ static void spirv_compiler_emit_resinfo(struct spirv_compiler *compiler, val_id = vkd3d_spirv_build_op_composite_construct(builder, type_id, constituents, i + 2); - component_type = VKD3D_SHADER_COMPONENT_FLOAT; - - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE); - if (instruction->flags == VKD3DSI_RESINFO_UINT) - { - /* SSA registers must match the specified result type. */ - if (!register_is_ssa(&dst->reg)) - val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); - else - component_type = VKD3D_SHADER_COMPONENT_UINT; - } - else + if (!(instruction->flags & VKD3DSI_RESINFO_UINT)) { + component_type = VKD3D_SHADER_COMPONENT_FLOAT; + type_id = vkd3d_spirv_get_type_id(builder, component_type, VKD3D_VEC4_SIZE); val_id = vkd3d_spirv_build_op_convert_utof(builder, type_id, val_id); } val_id = spirv_compiler_emit_swizzle(compiler, val_id, VKD3DSP_WRITEMASK_ALL, diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 8e9dbcd25..2175298a0 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2742,7 +2742,8 @@ static void shader_sm4_read_instruction(struct vkd3d_shader_sm4_parser *sm4, str } } - if (ins->opcode == VSIR_OP_SAMPLE_INFO && ins->flags & VKD3DSI_SAMPLE_INFO_UINT) + if ((ins->opcode == VSIR_OP_SAMPLE_INFO && ins->flags & VKD3DSI_SAMPLE_INFO_UINT) + || (ins->opcode == VSIR_OP_RESINFO && ins->flags & VKD3DSI_RESINFO_UINT)) ins->dst[0].reg.data_type = VSIR_DATA_U32; return;