January 2024 - Wine-commits

Giovanni Mascellani : vkd3d-shader: Use 64 bit swizzles for 64 bit data types in VSIR.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: vkd3d Branch: master Commit: 1f536238a89dc6bccb411c2db32d7b2010cc8fd7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1f536238a89dc6bccb411c2db32d7… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jan 22 17:15:36 2024 +0100 vkd3d-shader: Use 64 bit swizzles for 64 bit data types in VSIR. The handling of write masks and swizzles for 64 bit data types is currently irregular: write masks are always 64 bit, while swizzles are usually 32 bit, except for SSA registers with are 64 bit. With this change we always use 64 bit swizzles, in order to make the situation less surprising and make it easier to convert registers between SSA and TEMP. 64 bit swizzles are always required to have X in their last two components. --- libs/vkd3d-shader/d3d_asm.c | 17 ++++++++---- libs/vkd3d-shader/dxil.c | 12 ++++++-- libs/vkd3d-shader/spirv.c | 31 +++++++++++++-------- libs/vkd3d-shader/tpf.c | 3 ++ libs/vkd3d-shader/vkd3d_shader_private.h | 47 +++++++++++++++++++++++++++++--- 5 files changed, 87 insertions(+), 23 deletions(-)

1 0

Giovanni Mascellani : vkd3d-shader/ir: Check that SSA registers are used with compatible data types.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: vkd3d Branch: master Commit: edc406d29756976eb64635ae413e90db6cef41ce URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/edc406d29756976eb64635ae413e9… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Jan 25 14:32:01 2024 +0100 vkd3d-shader/ir: Check that SSA registers are used with compatible data types. Specifically, accesses are always 32 bit or always 64 bit. --- libs/vkd3d-shader/ir.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 1bb35fd7..56e8d974 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -2718,6 +2718,7 @@ struct validation_context struct validation_context_ssa_data { enum vsir_dimension dimension; + enum vkd3d_data_type data_type; size_t first_seen; uint32_t write_mask; uint32_t read_mask; @@ -2874,13 +2875,20 @@ static void vsir_validate_register(struct validation_context *ctx, if (data->dimension == VSIR_DIMENSION_NONE) { data->dimension = reg->dimension; + data->data_type = reg->data_type; data->first_seen = ctx->instruction_idx; } - else if (data->dimension != reg->dimension) + else { - validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DIMENSION, "Invalid dimension %#x for a SSA register: " - "it has already been seen with dimension %#x at instruction %zu.", - reg->dimension, data->dimension, data->first_seen); + if (data->dimension != reg->dimension) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DIMENSION, "Invalid dimension %#x for a SSA register: " + "it has already been seen with dimension %#x at instruction %zu.", + reg->dimension, data->dimension, data->first_seen); + + if (data_type_is_64_bit(data->data_type) != data_type_is_64_bit(reg->data_type)) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DATA_TYPE, "Invalid data type %#x for a SSA register: " + "it has already been seen with data type %#x at instruction %zu.", + reg->data_type, data->data_type, data->first_seen); } break; }

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_increment_u32() in vkd3d_instance_incref().
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: vkd3d Branch: master Commit: 042e2697916962a0bab1c5da7e7c7b308e5c62aa URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/042e2697916962a0bab1c5da7e7c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 24 20:37:37 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in vkd3d_instance_incref(). --- libs/vkd3d/device.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 2b855817..e7147afa 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -750,7 +750,7 @@ static void vkd3d_destroy_instance(struct vkd3d_instance *instance) ULONG vkd3d_instance_incref(struct vkd3d_instance *instance) { - ULONG refcount = InterlockedIncrement(&instance->refcount); + unsigned int refcount = vkd3d_atomic_increment_u32(&instance->refcount); TRACE("%p increasing refcount to %u.\n", instance, refcount); @@ -759,7 +759,7 @@ ULONG vkd3d_instance_incref(struct vkd3d_instance *instance) ULONG vkd3d_instance_decref(struct vkd3d_instance *instance) { - ULONG refcount = InterlockedDecrement(&instance->refcount); + unsigned int refcount = InterlockedDecrement((LONG *)&instance->refcount); TRACE("%p decreasing refcount to %u.\n", instance, refcount); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 64a01c41..cf6548c9 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -192,7 +192,7 @@ struct vkd3d_instance uint64_t host_ticks_per_second; - LONG refcount; + unsigned int refcount; }; #ifdef _WIN32

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_decrement_u32() in vkd3d_instance_decref().
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: vkd3d Branch: master Commit: f61891954eaaff294ddde5de9e6783ce66914b2f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f61891954eaaff294ddde5de9e678… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 24 20:39:13 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in vkd3d_instance_decref(). --- libs/vkd3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index e7147afa..3a0afeb6 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -759,7 +759,7 @@ ULONG vkd3d_instance_incref(struct vkd3d_instance *instance) ULONG vkd3d_instance_decref(struct vkd3d_instance *instance) { - unsigned int refcount = InterlockedDecrement((LONG *)&instance->refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&instance->refcount); TRACE("%p decreasing refcount to %u.\n", instance, refcount);

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_device_AddRef().
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: vkd3d Branch: master Commit: 7d7833f3c0279b002388689ee39f7d6d188d7b16 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7d7833f3c0279b002388689ee39f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 24 20:43:00 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_device_AddRef(). --- libs/vkd3d/device.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 3a0afeb6..859600ac 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2531,7 +2531,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_QueryInterface(ID3D12Device5 *ifac static ULONG STDMETHODCALLTYPE d3d12_device_AddRef(ID3D12Device5 *iface) { struct d3d12_device *device = impl_from_ID3D12Device5(iface); - ULONG refcount = InterlockedIncrement(&device->refcount); + unsigned int refcount = vkd3d_atomic_increment_u32(&device->refcount); TRACE("%p increasing refcount to %u.\n", device, refcount); @@ -2563,7 +2563,7 @@ static HRESULT device_worker_stop(struct d3d12_device *device) static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device5 *iface) { struct d3d12_device *device = impl_from_ID3D12Device5(iface); - ULONG refcount = InterlockedDecrement(&device->refcount); + unsigned int refcount = InterlockedDecrement((LONG *)&device->refcount); TRACE("%p decreasing refcount to %u.\n", device, refcount); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index cf6548c9..ec83d350 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1749,7 +1749,7 @@ struct vkd3d_desc_object_cache struct d3d12_device { ID3D12Device5 ID3D12Device5_iface; - LONG refcount; + unsigned int refcount; VkDevice vk_device; VkPhysicalDevice vk_physical_device;

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_device_Release().
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: vkd3d Branch: master Commit: 4fd4ecc0206b73468781787f50dd5cb48ff5f324 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4fd4ecc0206b73468781787f50dd5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 24 20:45:25 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_device_Release(). --- libs/vkd3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 859600ac..3f63e604 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2563,7 +2563,7 @@ static HRESULT device_worker_stop(struct d3d12_device *device) static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device5 *iface) { struct d3d12_device *device = impl_from_ID3D12Device5(iface); - unsigned int refcount = InterlockedDecrement((LONG *)&device->refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&device->refcount); TRACE("%p decreasing refcount to %u.\n", device, refcount);

1 0

Henri Verbeet : vkd3d-utils: Implement D3DDisassemble().
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: vkd3d Branch: master Commit: 8c6f5b847ba112301693eda38a1ce30b282ec555 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8c6f5b847ba112301693eda38a1ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 25 19:40:39 2024 +0100 vkd3d-utils: Implement D3DDisassemble(). Very loosely based on Wine's d3dcompiler_43. --- include/private/vkd3d_debug.h | 4 ++ include/vkd3d_d3dcompiler.h | 4 ++ include/vkd3d_utils.h | 2 + libs/vkd3d-utils/vkd3d_utils.map | 1 + libs/vkd3d-utils/vkd3d_utils_main.c | 72 ++++++++++++++++++++++++++++ tests/hlsl_d3d12.c | 93 +++++++++++++++++++++++++++++++++++++ 6 files changed, 176 insertions(+)

1 0

Henri Verbeet : vkd3d-shader/d3dbc: Do not fail parsing the shader when undeclared inputs are encountered.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: vkd3d Branch: master Commit: fef30dac2c422f9460a79dc47f216c42be31f68a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fef30dac2c422f9460a79dc47f216… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 23 19:31:41 2024 +0100 vkd3d-shader/d3dbc: Do not fail parsing the shader when undeclared inputs are encountered. These can be disassembled by D3DDisassemble() just fine, and perhaps more importantly, shader model 1 vertex shaders do not require dcl_ instructions in Direct3D 8. --- libs/vkd3d-shader/d3dbc.c | 2 +- tests/hlsl_d3d12.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 4ba001ea..a4ca7aa2 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -587,7 +587,7 @@ static void add_signature_mask(struct vkd3d_shader_sm1_parser *sm1, bool output, if (!(element = find_signature_element_by_register_index(signature, register_index))) { - vkd3d_shader_parser_error(&sm1->p, VKD3D_SHADER_ERROR_D3DBC_UNDECLARED_SEMANTIC, + vkd3d_shader_parser_warning(&sm1->p, VKD3D_SHADER_ERROR_D3DBC_UNDECLARED_SEMANTIC, "%s register %u was used without being declared.", output ? "Output" : "Input", register_index); return; } diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 272b8aca..28007e3a 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -1583,18 +1583,16 @@ static void test_disassemble_shader(void) ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); hr = D3DDisassemble(vs_1_1, sizeof(vs_1_1), 0, NULL, &blob); - todo ok(hr == S_OK, "Got hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D10Blob_Release(blob); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ID3D10Blob_Release(blob); hr = D3DDisassemble(vs_2_0, sizeof(vs_2_0), 0, NULL, &blob); ok(hr == S_OK, "Got hr %#x.\n", hr); ID3D10Blob_Release(blob); hr = D3DDisassemble(vs_3_0, sizeof(vs_3_0), 0, NULL, &blob); - todo ok(hr == S_OK, "Got hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D10Blob_Release(blob); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ID3D10Blob_Release(blob); hr = D3DDisassemble(vs_4_0, sizeof(vs_4_0), 0, NULL, &blob); todo ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Giovanni Mascellani : vkd3d-shader/spirv: Emit an error if merge information is missing.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: vkd3d Branch: master Commit: b97edee03d6c87390e95b681ee6f62b5d0844803 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b97edee03d6c87390e95b681ee6f6… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jan 17 14:24:43 2024 +0100 vkd3d-shader/spirv: Emit an error if merge information is missing. Instead of crashing. --- libs/vkd3d-shader/spirv.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6821a78f..544ed9d7 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7813,7 +7813,10 @@ static void spirv_compiler_emit_branch(struct spirv_compiler *compiler, if (instruction->src_count > 1) { /* Loop merge only. Must have a merge block and a continue block. */ - spirv_compiler_emit_merge(compiler, src[1].reg.idx[0].offset, src[2].reg.idx[0].offset); + if (instruction->src_count == 3) + spirv_compiler_emit_merge(compiler, src[1].reg.idx[0].offset, src[2].reg.idx[0].offset); + else + ERR("Invalid branch with %u sources.\n", instruction->src_count); } vkd3d_spirv_build_op_branch(builder, spirv_compiler_get_label_id(compiler, src[0].reg.idx[0].offset)); return; @@ -7830,8 +7833,11 @@ static void spirv_compiler_emit_branch(struct spirv_compiler *compiler, condition_id = spirv_compiler_emit_int_to_bool(compiler, VKD3D_SHADER_CONDITIONAL_OP_NZ, src[0].reg.data_type, 1, condition_id); /* Emit the merge immediately before the branch instruction. */ - spirv_compiler_emit_merge(compiler, src[3].reg.idx[0].offset, - (instruction->src_count > 4) ? src[4].reg.idx[0].offset : 0); + if (instruction->src_count >= 4) + spirv_compiler_emit_merge(compiler, src[3].reg.idx[0].offset, + (instruction->src_count > 4) ? src[4].reg.idx[0].offset : 0); + else + ERR("Invalid branch with %u sources.\n", instruction->src_count); vkd3d_spirv_build_op_branch_conditional(builder, condition_id, spirv_compiler_get_label_id(compiler, src[1].reg.idx[0].offset), spirv_compiler_get_label_id(compiler, src[2].reg.idx[0].offset));

1 0

Giovanni Mascellani : vkd3d-shader/ir: Lower monolithic switches to selection ladders.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: vkd3d Branch: master Commit: 378109051c601cebde705779169d0bfeb5bca051 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/378109051c601cebde705779169d0… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jan 3 16:18:50 2024 +0100 vkd3d-shader/ir: Lower monolithic switches to selection ladders. PHI nodes must be fixed up after this pass, because the block references might have become broken. For simplicitly this is not handled yet. The goal for this pass is to make the CFG structurizer simpler, because only conditional and unconditional branches must be supported. Eventually this limitation might be lifted if there is advantage in doing so. --- libs/vkd3d-shader/ir.c | 149 ++++++++++++++++++++++++++++++- libs/vkd3d-shader/spirv.c | 5 +- libs/vkd3d-shader/vkd3d_shader_private.h | 2 + 3 files changed, 153 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 9079be48..c2568316 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -442,6 +442,15 @@ void vsir_src_param_init(struct vkd3d_shader_src_param *param, enum vkd3d_shader param->modifiers = VKD3DSPSM_NONE; } +void vsir_dst_param_init(struct vkd3d_shader_dst_param *param, enum vkd3d_shader_register_type reg_type, + enum vkd3d_data_type data_type, unsigned int idx_count) +{ + vsir_register_init(&param->reg, reg_type, data_type, idx_count); + param->write_mask = VKD3DSP_WRITEMASK_0; + param->modifiers = VKD3DSPDM_NONE; + param->shift = 0; +} + void vsir_src_param_init_label(struct vkd3d_shader_src_param *param, unsigned int label_id) { vsir_src_param_init(param, VKD3DSPR_LABEL, VKD3D_DATA_UINT, 1); @@ -449,6 +458,18 @@ void vsir_src_param_init_label(struct vkd3d_shader_src_param *param, unsigned in param->reg.idx[0].offset = label_id; } +static void src_param_init_ssa_bool(struct vkd3d_shader_src_param *src, unsigned int idx) +{ + vsir_src_param_init(src, VKD3DSPR_SSA, VKD3D_DATA_BOOL, 1); + src->reg.idx[0].offset = idx; +} + +static void dst_param_init_ssa_bool(struct vkd3d_shader_dst_param *dst, unsigned int idx) +{ + vsir_dst_param_init(dst, VKD3DSPR_SSA, VKD3D_DATA_BOOL, 1); + dst->reg.idx[0].offset = idx; +} + void vsir_instruction_init(struct vkd3d_shader_instruction *ins, const struct vkd3d_shader_location *location, enum vkd3d_shader_opcode handler_idx) { @@ -2350,6 +2371,127 @@ static enum vkd3d_result flatten_control_flow_constructs(struct vkd3d_shader_par return result; } +static unsigned int label_from_src_param(const struct vkd3d_shader_src_param *param) +{ + assert(param->reg.type == VKD3DSPR_LABEL); + return param->reg.idx[0].offset; +} + +static bool reserve_instructions(struct vkd3d_shader_instruction **instructions, size_t *capacity, size_t count) +{ + if (!vkd3d_array_reserve((void **)instructions, capacity, count, sizeof(**instructions))) + { + ERR("Failed to allocate instructions.\n"); + return false; + } + + return true; +} + +static enum vkd3d_result lower_switch_to_if_ladder(struct vkd3d_shader_parser *parser) +{ + unsigned int block_count = parser->program.block_count, ssa_count = parser->program.ssa_count; + struct vkd3d_shader_instruction *instructions = NULL; + size_t ins_capacity = 0, ins_count = 0, i; + + if (!reserve_instructions(&instructions, &ins_capacity, parser->program.instructions.count)) + goto fail; + + for (i = 0; i < parser->program.instructions.count; ++i) + { + struct vkd3d_shader_instruction *ins = &parser->program.instructions.elements[i]; + unsigned int case_count, j, default_label; + + switch (ins->handler_idx) + { + case VKD3DSIH_SWITCH_MONOLITHIC: + break; + + case VKD3DSIH_PHI: + WARN("Unhandled PHI when lowering switch.\n"); + vkd3d_shader_parser_error(parser, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED, + "Unhandled PHI when lowering switch."); + return VKD3D_ERROR_NOT_IMPLEMENTED; + + default: + if (!reserve_instructions(&instructions, &ins_capacity, ins_count + 1)) + goto fail; + instructions[ins_count++] = *ins; + continue; + } + + case_count = (ins->src_count - 3) / 2; + default_label = label_from_src_param(&ins->src[1]); + + /* In principle we can have a switch with no cases, and we + * just have to jump to the default label. */ + if (case_count == 0) + { + if (!reserve_instructions(&instructions, &ins_capacity, ins_count + 1)) + goto fail; + + if (!vsir_instruction_init_with_params(parser, &instructions[ins_count], &ins->location, VKD3DSIH_BRANCH, 0, 1)) + goto fail; + vsir_src_param_init_label(&instructions[ins_count].src[0], default_label); + ++ins_count; + } + + if (!reserve_instructions(&instructions, &ins_capacity, ins_count + 3 * case_count - 1)) + goto fail; + + for (j = 0; j < case_count; ++j) + { + unsigned int fallthrough_label, case_label = label_from_src_param(&ins->src[3 + 2 * j + 1]); + + if (!vsir_instruction_init_with_params(parser, &instructions[ins_count], &ins->location, VKD3DSIH_IEQ, 1, 2)) + goto fail; + dst_param_init_ssa_bool(&instructions[ins_count].dst[0], ssa_count); + instructions[ins_count].src[0] = ins->src[0]; + instructions[ins_count].src[1] = ins->src[3 + 2 * j]; + ++ins_count; + + /* For all cases except the last one we fall through to + * the following case; the last one has to jump to the + * default label. */ + if (j == case_count - 1) + fallthrough_label = default_label; + else + fallthrough_label = block_count + 1; + + if (!vsir_instruction_init_with_params(parser, &instructions[ins_count], &ins->location, VKD3DSIH_BRANCH, 0, 3)) + goto fail; + src_param_init_ssa_bool(&instructions[ins_count].src[0], ssa_count); + vsir_src_param_init_label(&instructions[ins_count].src[1], case_label); + vsir_src_param_init_label(&instructions[ins_count].src[2], fallthrough_label); + ++ins_count; + + ++ssa_count; + + if (j != case_count - 1) + { + if (!vsir_instruction_init_with_params(parser, &instructions[ins_count], &ins->location, VKD3DSIH_LABEL, 0, 1)) + goto fail; + vsir_src_param_init_label(&instructions[ins_count].src[0], ++block_count); + ++ins_count; + } + } + } + + vkd3d_free(parser->program.instructions.elements); + parser->program.instructions.elements = instructions; + parser->program.instructions.capacity = ins_capacity; + parser->program.instructions.count = ins_count; + parser->program.block_count = block_count; + parser->program.ssa_count = ssa_count; + + return VKD3D_OK; + +fail: + vkd3d_free(instructions); + + return VKD3D_ERROR_OUT_OF_MEMORY; +} + enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, const struct vkd3d_shader_compile_info *compile_info) { @@ -2361,7 +2503,12 @@ enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, if ((result = instruction_array_lower_texkills(parser)) < 0) return result; - if (!parser->shader_desc.is_dxil) + if (parser->shader_desc.is_dxil) + { + if ((result = lower_switch_to_if_ladder(parser)) < 0) + return result; + } + else { if (parser->program.shader_version.type != VKD3D_SHADER_TYPE_PIXEL) { diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 544ed9d7..91411bf6 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7830,8 +7830,9 @@ static void spirv_compiler_emit_branch(struct spirv_compiler *compiler, } condition_id = spirv_compiler_emit_load_src(compiler, &src[0], VKD3DSP_WRITEMASK_0); - condition_id = spirv_compiler_emit_int_to_bool(compiler, - VKD3D_SHADER_CONDITIONAL_OP_NZ, src[0].reg.data_type, 1, condition_id); + if (src[0].reg.data_type != VKD3D_DATA_BOOL) + condition_id = spirv_compiler_emit_int_to_bool(compiler, + VKD3D_SHADER_CONDITIONAL_OP_NZ, src[0].reg.data_type, 1, condition_id); /* Emit the merge immediately before the branch instruction. */ if (instruction->src_count >= 4) spirv_compiler_emit_merge(compiler, src[3].reg.idx[0].offset, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 28862884..f8c4d61e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -895,6 +895,8 @@ struct vkd3d_shader_src_param void vsir_src_param_init(struct vkd3d_shader_src_param *param, enum vkd3d_shader_register_type reg_type, enum vkd3d_data_type data_type, unsigned int idx_count); +void vsir_dst_param_init(struct vkd3d_shader_dst_param *param, enum vkd3d_shader_register_type reg_type, + enum vkd3d_data_type data_type, unsigned int idx_count); void vsir_src_param_init_label(struct vkd3d_shader_src_param *param, unsigned int label_id); struct vkd3d_shader_index_range

1 0