November 2023 - Wine-commits

Zebediah Figura : vkd3d-shader/hlsl: Do not prioritize an exact match when looking up functions.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: fef118555cd6341eb648f482a4517d61c347a0d3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fef118555cd6341eb648f482a4517… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 8 16:44:55 2023 -0500 vkd3d-shader/hlsl: Do not prioritize an exact match when looking up functions. Native does not always do this. For example, functions whose parameters are float and float1 always result in an "ambiguous function call" error. This does not fix any tests, because the relevant tests previously (incorrectly) succeeded, and now fail with: E5017: Aborting due to not yet implemented feature: Prioritize between multiple compatible function overloads. when they should simply fail. --- libs/vkd3d-shader/hlsl.y | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index baae591d..57c63c43 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2325,21 +2325,6 @@ static struct hlsl_block *initialize_vars(struct hlsl_ctx *ctx, struct list *var return initializers; } -static bool func_is_exact_match(const struct hlsl_ir_function_decl *decl, const struct parse_initializer *args) -{ - unsigned int i; - - if (decl->parameters.count != args->args_count) - return false; - - for (i = 0; i < decl->parameters.count; ++i) - { - if (!hlsl_types_are_equal(decl->parameters.vars[i]->data_type, args->args[i]->data_type)) - return false; - } - return true; -} - static bool func_is_compatible_match(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl *decl, const struct parse_initializer *args) { @@ -2370,9 +2355,6 @@ static struct hlsl_ir_function_decl *find_function_call(struct hlsl_ctx *ctx, LIST_FOR_EACH_ENTRY(decl, &func->overloads, struct hlsl_ir_function_decl, entry) { - if (func_is_exact_match(decl, args)) - return decl; - if (func_is_compatible_match(ctx, decl, args)) { if (compatible_match)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Return bool from compare_function_decl().
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: 8f041fbe6f7e74ef3108a54b037c4d427e66d587 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8f041fbe6f7e74ef3108a54b037c4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 8 16:47:19 2023 -0500 vkd3d-shader/hlsl: Return bool from compare_function_decl(). --- libs/vkd3d-shader/hlsl.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 7893497d..37dfccf2 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2098,21 +2098,20 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls return 0; } -static int compare_function_decl(const struct hlsl_ir_function_decl *decl, +static bool func_decl_matches(const struct hlsl_ir_function_decl *decl, const struct hlsl_func_parameters *parameters) { size_t i; - int r; - if ((r = vkd3d_u32_compare(parameters->count, decl->parameters.count))) - return r; + if (parameters->count != decl->parameters.count) + return false; for (i = 0; i < parameters->count; ++i) { - if ((r = compare_param_hlsl_types(parameters->vars[i]->data_type, decl->parameters.vars[i]->data_type))) - return r; + if (compare_param_hlsl_types(parameters->vars[i]->data_type, decl->parameters.vars[i]->data_type)) + return false; } - return 0; + return true; } struct hlsl_ir_function_decl *hlsl_get_func_decl(struct hlsl_ctx *ctx, const char *name, @@ -2126,7 +2125,7 @@ struct hlsl_ir_function_decl *hlsl_get_func_decl(struct hlsl_ctx *ctx, const cha LIST_FOR_EACH_ENTRY(decl, &func->overloads, struct hlsl_ir_function_decl, entry) { - if (!compare_function_decl(decl, parameters)) + if (func_decl_matches(decl, parameters)) return decl; }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use hlsl_types_are_equal() in func_decl_matches().
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: ade8899456f8e38c9b74799fcdbfdf6967173224 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ade8899456f8e38c9b74799fcdbfd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 8 16:48:10 2023 -0500 vkd3d-shader/hlsl: Use hlsl_types_are_equal() in func_decl_matches(). Besides reusing code, this now handles UAV types correctly. --- libs/vkd3d-shader/hlsl.c | 52 +----------------------------------------------- 1 file changed, 1 insertion(+), 51 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 37dfccf2..593ca0a3 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2048,56 +2048,6 @@ void hlsl_pop_scope(struct hlsl_ctx *ctx) ctx->cur_scope = prev_scope; } -static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hlsl_type *t2) -{ - int r; - - if ((r = vkd3d_u32_compare(t1->class, t2->class))) - return r; - if ((r = vkd3d_u32_compare(t1->base_type, t2->base_type))) - return r; - if (t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) - { - if ((r = vkd3d_u32_compare(t1->sampler_dim, t2->sampler_dim))) - return r; - if (t1->base_type == HLSL_TYPE_TEXTURE && t1->sampler_dim != HLSL_SAMPLER_DIM_GENERIC - && (r = compare_param_hlsl_types(t1->e.resource_format, t2->e.resource_format))) - return r; - } - if ((r = vkd3d_u32_compare(t1->dimx, t2->dimx))) - return r; - if ((r = vkd3d_u32_compare(t1->dimy, t2->dimy))) - return r; - if (t1->class == HLSL_CLASS_STRUCT) - { - size_t i; - - if (t1->e.record.field_count != t2->e.record.field_count) - return t1->e.record.field_count - t2->e.record.field_count; - - for (i = 0; i < t1->e.record.field_count; ++i) - { - const struct hlsl_struct_field *field1 = &t1->e.record.fields[i]; - const struct hlsl_struct_field *field2 = &t2->e.record.fields[i]; - - if ((r = compare_param_hlsl_types(field1->type, field2->type))) - return r; - - if ((r = strcmp(field1->name, field2->name))) - return r; - } - return 0; - } - if (t1->class == HLSL_CLASS_ARRAY) - { - if ((r = vkd3d_u32_compare(t1->e.array.elements_count, t2->e.array.elements_count))) - return r; - return compare_param_hlsl_types(t1->e.array.type, t2->e.array.type); - } - - return 0; -} - static bool func_decl_matches(const struct hlsl_ir_function_decl *decl, const struct hlsl_func_parameters *parameters) { @@ -2108,7 +2058,7 @@ static bool func_decl_matches(const struct hlsl_ir_function_decl *decl, for (i = 0; i < parameters->count; ++i) { - if (compare_param_hlsl_types(parameters->vars[i]->data_type, decl->parameters.vars[i]->data_type)) + if (!hlsl_types_are_equal(parameters->vars[i]->data_type, decl->parameters.vars[i]->data_type)) return false; } return true;

1 0

Conor McCarthy : vkd3d-shader/ir: Check the handler before changing it to NOP in remove_dead_code().
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: 5768c019c1b486d25c7eb17cc826bb3eaa0d8c22 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5768c019c1b486d25c7eb17cc826b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Nov 9 14:07:03 2023 +1000 vkd3d-shader/ir: Check the handler before changing it to NOP in remove_dead_code(). --- libs/vkd3d-shader/ir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index abc8b1cd..72ba057d 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1295,9 +1295,9 @@ static void remove_dead_code(struct vkd3d_shader_parser *parser) { if (depth > 0) { - vkd3d_shader_instruction_make_nop(ins); if (ins->handler_idx != VKD3DSIH_ELSE) --depth; + vkd3d_shader_instruction_make_nop(ins); } else {

1 0

Giovanni Mascellani : vkd3d-shader/ir: Keep track of hull shader phases.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: 0f4bda9c9d5b4d301ac96c7168c1ab1928fa0c59 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0f4bda9c9d5b4d301ac96c7168c1a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Nov 6 23:11:03 2023 +0100 vkd3d-shader/ir: Keep track of hull shader phases. --- libs/vkd3d-shader/ir.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 72ba057d..f8f56efd 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1472,6 +1472,7 @@ struct validation_context struct vkd3d_shader_parser *parser; size_t instruction_idx; bool dcl_temps_found; + enum vkd3d_shader_opcode phase; enum vkd3d_shader_opcode *blocks; size_t depth; @@ -1620,6 +1621,32 @@ static void vsir_validate_instruction(struct validation_context *ctx) instruction->handler_idx); } + switch (instruction->handler_idx) + { + case VKD3DSIH_HS_DECLS: + case VKD3DSIH_HS_CONTROL_POINT_PHASE: + case VKD3DSIH_HS_FORK_PHASE: + case VKD3DSIH_HS_JOIN_PHASE: + vsir_validate_dst_count(ctx, instruction, 0); + vsir_validate_src_count(ctx, instruction, 0); + if (ctx->parser->shader_version.type != VKD3D_SHADER_TYPE_HULL) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER, "Phase instruction %#x is only valid in a hull shader.", + instruction->handler_idx); + if (ctx->depth != 0) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INSTRUCTION_NESTING, "Phase instruction %#x must appear to top level.", + instruction->handler_idx); + ctx->phase = instruction->handler_idx; + return; + + default: + break; + } + + if (ctx->parser->shader_version.type == VKD3D_SHADER_TYPE_HULL && + ctx->phase == VKD3DSIH_INVALID) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER, "Instruction %#x appear before any phase instruction in a hull shader.", + instruction->handler_idx); + switch (instruction->handler_idx) { case VKD3DSIH_DCL_TEMPS: @@ -1720,7 +1747,11 @@ static void vsir_validate_instruction(struct validation_context *ctx) void vsir_validate(struct vkd3d_shader_parser *parser) { - struct validation_context ctx = { .parser = parser }; + struct validation_context ctx = + { + .parser = parser, + .phase = VKD3DSIH_INVALID, + }; if (!(parser->config_flags & VKD3D_SHADER_CONFIG_FLAG_FORCE_VALIDATION)) return;

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate the TEMP register indices in each HS phase.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: a869069a481519c4daa76819f6eb6308884be5ef URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a869069a481519c4daa76819f6eb6… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Nov 7 23:21:11 2023 +0100 vkd3d-shader/ir: Validate the TEMP register indices in each HS phase. --- libs/vkd3d-shader/ir.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index f8f56efd..45027188 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1472,6 +1472,7 @@ struct validation_context struct vkd3d_shader_parser *parser; size_t instruction_idx; bool dcl_temps_found; + unsigned int temp_count; enum vkd3d_shader_opcode phase; enum vkd3d_shader_opcode *blocks; @@ -1500,6 +1501,12 @@ static void VKD3D_PRINTF_FUNC(3, 4) validator_error(struct validation_context *c static void vsir_validate_register(struct validation_context *ctx, const struct vkd3d_shader_register *reg) { + unsigned int temp_count = ctx->temp_count; + + /* SM1-3 shaders do not include a DCL_TEMPS instruction. */ + if (ctx->parser->shader_version.major <= 3) + temp_count = ctx->parser->shader_desc.temp_count; + if (reg->type >= VKD3DSPR_COUNT) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE, "Invalid register type %#x.", reg->type); @@ -1530,9 +1537,9 @@ static void vsir_validate_register(struct validation_context *ctx, if (reg->idx_count >= 1 && reg->idx[0].rel_addr) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, "Non-NULL relative address for a TEMP register."); - if (reg->idx_count >= 1 && reg->idx[0].offset >= ctx->parser->shader_desc.temp_count) - validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, "TEMP register index %u exceeds the declared count %u.", - reg->idx[0].offset, ctx->parser->shader_desc.temp_count); + if (reg->idx_count >= 1 && reg->idx[0].offset >= temp_count) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, "TEMP register index %u exceeds the maximum count %u.", + reg->idx[0].offset, temp_count); break; default: @@ -1636,6 +1643,8 @@ static void vsir_validate_instruction(struct validation_context *ctx) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INSTRUCTION_NESTING, "Phase instruction %#x must appear to top level.", instruction->handler_idx); ctx->phase = instruction->handler_idx; + ctx->dcl_temps_found = false; + ctx->temp_count = 0; return; default: @@ -1652,15 +1661,13 @@ static void vsir_validate_instruction(struct validation_context *ctx) case VKD3DSIH_DCL_TEMPS: vsir_validate_dst_count(ctx, instruction, 0); vsir_validate_src_count(ctx, instruction, 0); - /* TODO Check that each phase in a hull shader has at most - * one occurrence. */ - if (ctx->dcl_temps_found && ctx->parser->shader_version.type != VKD3D_SHADER_TYPE_HULL) + if (ctx->dcl_temps_found) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_DUPLICATE_DCL_TEMPS, "Duplicate DCL_TEMPS instruction."); - ctx->dcl_temps_found = true; - if (instruction->declaration.count != ctx->parser->shader_desc.temp_count && - ctx->parser->shader_version.type != VKD3D_SHADER_TYPE_HULL) - validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DCL_TEMPS, "Invalid DCL_TEMPS count %u, expected %u.", + if (instruction->declaration.count > ctx->parser->shader_desc.temp_count) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DCL_TEMPS, "Invalid DCL_TEMPS count %u, expected at most %u.", instruction->declaration.count, ctx->parser->shader_desc.temp_count); + ctx->dcl_temps_found = true; + ctx->temp_count = instruction->declaration.count; break; case VKD3DSIH_IF:

1 0

Giovanni Mascellani : vkd3d-shader/ir: Use vsir_register_init() to initialize a register.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: b7aeb5dd7043ebab19bb81a5ed223f3ef9abea2e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b7aeb5dd7043ebab19bb81a5ed223… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Nov 8 11:11:39 2023 +0100 vkd3d-shader/ir: Use vsir_register_init() to initialize a register. --- libs/vkd3d-shader/ir.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 45027188..1fc3f6dd 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -62,17 +62,7 @@ static void shader_instruction_eliminate_phase_instance_id(struct vkd3d_shader_i reg = (struct vkd3d_shader_register *)&ins->src[i].reg; if (shader_register_is_phase_instance_id(reg)) { - reg->type = VKD3DSPR_IMMCONST; - reg->precision = VKD3D_SHADER_REGISTER_PRECISION_DEFAULT; - reg->non_uniform = false; - reg->idx[0].offset = ~0u; - reg->idx[0].rel_addr = NULL; - reg->idx[1].offset = ~0u; - reg->idx[1].rel_addr = NULL; - reg->idx[2].offset = ~0u; - reg->idx[2].rel_addr = NULL; - reg->idx_count = 0; - reg->dimension = VSIR_DIMENSION_SCALAR; + vsir_register_init(reg, VKD3DSPR_IMMCONST, reg->data_type, 0); reg->u.immconst_uint[0] = instance_id; continue; }

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate register indices.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: 12fcb8dcc6b35c6cafce6c61db4060696178d465 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/12fcb8dcc6b35c6cafce6c61db406… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Nov 8 23:10:06 2023 +0100 vkd3d-shader/ir: Validate register indices. --- libs/vkd3d-shader/ir.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 1fc3f6dd..c2bad117 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1488,10 +1488,13 @@ static void VKD3D_PRINTF_FUNC(3, 4) validator_error(struct validation_context *c vkd3d_string_buffer_cleanup(&buf); } +static void vsir_validate_src_param(struct validation_context *ctx, + const struct vkd3d_shader_src_param *src); + static void vsir_validate_register(struct validation_context *ctx, const struct vkd3d_shader_register *reg) { - unsigned int temp_count = ctx->temp_count; + unsigned int i, temp_count = ctx->temp_count; /* SM1-3 shaders do not include a DCL_TEMPS instruction. */ if (ctx->parser->shader_version.major <= 3) @@ -1517,6 +1520,13 @@ static void vsir_validate_register(struct validation_context *ctx, validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX_COUNT, "Invalid register index count %u.", reg->idx_count); + for (i = 0; i < min(reg->idx_count, ARRAY_SIZE(reg->idx)); ++i) + { + const struct vkd3d_shader_src_param *param = reg->idx[i].rel_addr; + if (reg->idx[i].rel_addr) + vsir_validate_src_param(ctx, param); + } + switch (reg->type) { case VKD3DSPR_TEMP:

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate index count for NULL registers.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: c8676829829514c91f078f282d474a2abdfa5aab URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c8676829829514c91f078f282d474… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Nov 8 23:12:30 2023 +0100 vkd3d-shader/ir: Validate index count for NULL registers. --- libs/vkd3d-shader/ir.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index c2bad117..0f8d596b 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1542,6 +1542,12 @@ static void vsir_validate_register(struct validation_context *ctx, reg->idx[0].offset, temp_count); break; + case VKD3DSPR_NULL: + if (reg->idx_count != 0) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX_COUNT, "Invalid index count %u for a NULL register.", + reg->idx_count); + break; + default: break; }

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate index count for IMMCONST registers.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: b74470b9d2bba1278f656e597ac40e26013c3f6f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b74470b9d2bba1278f656e597ac40… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Nov 8 23:17:05 2023 +0100 vkd3d-shader/ir: Validate index count for IMMCONST registers. --- libs/vkd3d-shader/ir.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 0f8d596b..ffc505cd 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1548,6 +1548,12 @@ static void vsir_validate_register(struct validation_context *ctx, reg->idx_count); break; + case VKD3DSPR_IMMCONST: + if (reg->idx_count != 0) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX_COUNT, "Invalid index count %u for a IMMCONST register.", + reg->idx_count); + break; + default: break; }

1 0