May 2023 - Wine-commits - list.winehq.org

Zebediah Figura : vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_mod().
by Alexandre Julliard 26 May '23

26 May '23

Module: vkd3d Branch: master Commit: ad0ab664d25251d88e97879bfd9c1c152a56ca82 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ad0ab664d25251d88e97879bfd9c1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 11 18:53:33 2022 -0600 vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_mod(). --- libs/vkd3d-shader/hlsl_constant_ops.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index a60ced01..88583231 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -362,44 +362,43 @@ static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons return true; } -static bool fold_mod(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, - struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +static bool fold_mod(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, + const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2, + const struct vkd3d_shader_location *loc) { - enum hlsl_base_type type = dst->node.data_type->base_type; + enum hlsl_base_type type = dst_type->base_type; unsigned int k; assert(type == src1->node.data_type->base_type); assert(type == src2->node.data_type->base_type); - for (k = 0; k < dst->node.data_type->dimx; ++k) + for (k = 0; k < dst_type->dimx; ++k) { switch (type) { case HLSL_TYPE_INT: if (src2->value.u[k].i == 0) { - hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, - "Division by zero."); + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, "Division by zero."); return false; } if (src1->value.u[k].i == INT_MIN && src2->value.u[k].i == -1) - dst->value.u[k].i = 0; + dst->u[k].i = 0; else - dst->value.u[k].i = src1->value.u[k].i % src2->value.u[k].i; + dst->u[k].i = src1->value.u[k].i % src2->value.u[k].i; break; case HLSL_TYPE_UINT: if (src2->value.u[k].u == 0) { - hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, - "Division by zero."); + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, "Division by zero."); return false; } - dst->value.u[k].u = src1->value.u[k].u % src2->value.u[k].u; + dst->u[k].u = src1->value.u[k].u % src2->value.u[k].u; break; default: - FIXME("Fold modulus for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + FIXME("Fold modulus for type %s.\n", debug_hlsl_type(ctx, dst_type)); return false; } } @@ -605,7 +604,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, break; case HLSL_OP2_MOD: - success = fold_mod(ctx, res, arg1, arg2); + success = fold_mod(ctx, &res->value, instr->data_type, arg1, arg2, &instr->loc); break; case HLSL_OP2_MAX:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_max().
by Alexandre Julliard 26 May '23

26 May '23

Module: vkd3d Branch: master Commit: aa82f61ef35ae2a28f96ee72697223e87ca1d665 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/aa82f61ef35ae2a28f96ee7269722… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 11 18:54:25 2022 -0600 vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_max(). --- libs/vkd3d-shader/hlsl_constant_ops.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 88583231..e249bd2a 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -405,29 +405,29 @@ static bool fold_mod(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons return true; } -static bool fold_max(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, - struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +static bool fold_max(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, + const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) { - enum hlsl_base_type type = dst->node.data_type->base_type; + enum hlsl_base_type type = dst_type->base_type; unsigned int k; assert(type == src1->node.data_type->base_type); assert(type == src2->node.data_type->base_type); - for (k = 0; k < dst->node.data_type->dimx; ++k) + for (k = 0; k < dst_type->dimx; ++k) { switch (type) { case HLSL_TYPE_INT: - dst->value.u[k].i = max(src1->value.u[k].i, src2->value.u[k].i); + dst->u[k].i = max(src1->value.u[k].i, src2->value.u[k].i); break; case HLSL_TYPE_UINT: - dst->value.u[k].u = max(src1->value.u[k].u, src2->value.u[k].u); + dst->u[k].u = max(src1->value.u[k].u, src2->value.u[k].u); break; default: - FIXME("Fold max for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + FIXME("Fold max for type %s.\n", debug_hlsl_type(ctx, dst_type)); return false; } } @@ -608,7 +608,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, break; case HLSL_OP2_MAX: - success = fold_max(ctx, res, arg1, arg2); + success = fold_max(ctx, &res->value, instr->data_type, arg1, arg2); break; case HLSL_OP2_MIN:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_min().
by Alexandre Julliard 26 May '23

26 May '23

Module: vkd3d Branch: master Commit: c805eb1191eb0a9b576cf2b83bbb32cc81f24e41 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c805eb1191eb0a9b576cf2b83bbb3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 11 18:55:55 2022 -0600 vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_min(). --- libs/vkd3d-shader/hlsl_constant_ops.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index e249bd2a..ae2fd5a5 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -434,29 +434,29 @@ static bool fold_max(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons return true; } -static bool fold_min(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, - struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +static bool fold_min(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, + const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) { - enum hlsl_base_type type = dst->node.data_type->base_type; + enum hlsl_base_type type = dst_type->base_type; unsigned int k; assert(type == src1->node.data_type->base_type); assert(type == src2->node.data_type->base_type); - for (k = 0; k < dst->node.data_type->dimx; ++k) + for (k = 0; k < dst_type->dimx; ++k) { switch (type) { case HLSL_TYPE_INT: - dst->value.u[k].i = min(src1->value.u[k].i, src2->value.u[k].i); + dst->u[k].i = min(src1->value.u[k].i, src2->value.u[k].i); break; case HLSL_TYPE_UINT: - dst->value.u[k].u = min(src1->value.u[k].u, src2->value.u[k].u); + dst->u[k].u = min(src1->value.u[k].u, src2->value.u[k].u); break; default: - FIXME("Fold min for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + FIXME("Fold min for type %s.\n", debug_hlsl_type(ctx, dst_type)); return false; } } @@ -612,7 +612,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, break; case HLSL_OP2_MIN: - success = fold_min(ctx, res, arg1, arg2); + success = fold_min(ctx, &res->value, instr->data_type, arg1, arg2); break; case HLSL_OP2_BIT_XOR:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_abs().
by Alexandre Julliard 26 May '23

26 May '23

Module: vkd3d Branch: master Commit: b453a0acd6121a4395f35b8376e61f21baed9a86 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b453a0acd6121a4395f35b8376e61… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 23 10:07:58 2023 -0500 vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_abs(). --- libs/vkd3d-shader/hlsl_constant_ops.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index ae2fd5a5..9fa2acd5 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -22,40 +22,41 @@ #include "hlsl.h" -static bool fold_abs(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src) +static bool fold_abs(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, + const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src) { - enum hlsl_base_type type = dst->node.data_type->base_type; + enum hlsl_base_type type = dst_type->base_type; unsigned int k; assert(type == src->node.data_type->base_type); - for (k = 0; k < 4; ++k) + for (k = 0; k < dst_type->dimx; ++k) { switch (type) { case HLSL_TYPE_FLOAT: case HLSL_TYPE_HALF: - dst->value.u[k].f = fabsf(src->value.u[k].f); + dst->u[k].f = fabsf(src->value.u[k].f); break; case HLSL_TYPE_DOUBLE: - dst->value.u[k].d = fabs(src->value.u[k].d); + dst->u[k].d = fabs(src->value.u[k].d); break; case HLSL_TYPE_INT: /* C's abs(INT_MIN) is undefined, but HLSL evaluates this to INT_MIN */ if (src->value.u[k].i == INT_MIN) - dst->value.u[k].i = INT_MIN; + dst->u[k].i = INT_MIN; else - dst->value.u[k].i = abs(src->value.u[k].i); + dst->u[k].i = abs(src->value.u[k].i); break; case HLSL_TYPE_UINT: - dst->value.u[k].u = src->value.u[k].u; + dst->u[k].u = src->value.u[k].u; break; default: - FIXME("Fold abs() for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + FIXME("Fold abs() for type %s.\n", debug_hlsl_type(ctx, dst_type)); return false; } } @@ -576,7 +577,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, switch (expr->op) { case HLSL_OP1_ABS: - success = fold_abs(ctx, res, arg1); + success = fold_abs(ctx, &res->value, instr->data_type, arg1); break; case HLSL_OP1_CAST:

1 0

Jan Sikorski : vkd3d-shader/spirv: Ensure that the OpLabel emitted vkd3d_spirv_builder_begin_main_function() gets terminated.
by Alexandre Julliard 26 May '23

26 May '23

Module: vkd3d Branch: master Commit: bb680e73de4ac22700ec89b1f466eea8da0a2120 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bb680e73de4ac22700ec89b1f466e… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Thu May 25 10:12:35 2023 +0200 vkd3d-shader/spirv: Ensure that the OpLabel emitted vkd3d_spirv_builder_begin_main_function() gets terminated. --- libs/vkd3d-shader/spirv.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 29423028..cc0b63e8 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2244,6 +2244,7 @@ struct spirv_compiler struct vkd3d_push_constant_buffer_binding *push_constants; const struct vkd3d_shader_spirv_target_info *spirv_target_info; + bool main_block_open; bool after_declarations_section; struct shader_signature input_signature; struct shader_signature output_signature; @@ -5211,6 +5212,7 @@ static void spirv_compiler_emit_initial_declarations(struct spirv_compiler *comp if (compiler->shader_type != VKD3D_SHADER_TYPE_HULL) { vkd3d_spirv_builder_begin_main_function(builder); + compiler->main_block_open = true; } } @@ -7509,6 +7511,8 @@ static int spirv_compiler_emit_control_flow_instruction(struct spirv_compiler *c if (cf_info) cf_info->inside_block = false; + else + compiler->main_block_open = false; break; case VKD3DSIH_RETP: @@ -9469,6 +9473,9 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, if (result < 0) return result; + if (compiler->main_block_open) + vkd3d_spirv_build_op_return(builder); + if (!is_in_default_phase(compiler)) spirv_compiler_leave_shader_phase(compiler); else

1 0

Conor McCarthy : vkd3d-shader/spirv: Set the register index count in spirv_compiler_get_invocation_id().
by Alexandre Julliard 26 May '23

26 May '23

Module: vkd3d Branch: master Commit: 7e58511b76dd523d70abe4d40898ed5e784c5a30 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7e58511b76dd523d70abe4d40898e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri May 26 16:33:45 2023 +1000 vkd3d-shader/spirv: Set the register index count in spirv_compiler_get_invocation_id(). --- libs/vkd3d-shader/spirv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ed24e743..5c639858 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4272,6 +4272,7 @@ static uint32_t spirv_compiler_get_invocation_id(struct spirv_compiler *compiler r.type = VKD3DSPR_OUTPOINTID; r.idx[0].offset = ~0u; r.idx[1].offset = ~0u; + r.idx_count = 0; return spirv_compiler_get_register_id(compiler, &r); }

1 0

Conor McCarthy : vkd3d-shader/spirv: Set the register index count in spirv_compiler_emit_hull_shader_builtins().
by Alexandre Julliard 26 May '23

26 May '23

Module: vkd3d Branch: master Commit: bf1ecc0f602556c6597b4a2427077978e3126293 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bf1ecc0f602556c6597b4a2427077… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri May 26 16:34:55 2023 +1000 vkd3d-shader/spirv: Set the register index count in spirv_compiler_emit_hull_shader_builtins(). --- libs/vkd3d-shader/spirv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 5c639858..7e8023f1 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5172,6 +5172,7 @@ static void spirv_compiler_emit_hull_shader_builtins(struct spirv_compiler *comp dst.reg.type = VKD3DSPR_OUTPOINTID; dst.reg.idx[0].offset = ~0u; dst.reg.idx[1].offset = ~0u; + dst.reg.idx_count = 0; dst.write_mask = VKD3DSP_WRITEMASK_0; spirv_compiler_emit_input_register(compiler, &dst); }

1 0

Conor McCarthy : vkd3d-shader/spirv: Set the register index count in spirv_compiler_emit_dcl_indexable_temp().
by Alexandre Julliard 26 May '23

26 May '23

Module: vkd3d Branch: master Commit: 9c6040df02cf461822a508561b94b60ee811cb5d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9c6040df02cf461822a508561b94b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri May 26 16:35:23 2023 +1000 vkd3d-shader/spirv: Set the register index count in spirv_compiler_emit_dcl_indexable_temp(). --- libs/vkd3d-shader/spirv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7e8023f1..4bb4aabe 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5299,6 +5299,7 @@ static void spirv_compiler_emit_dcl_indexable_temp(struct spirv_compiler *compil reg.type = VKD3DSPR_IDXTEMP; reg.idx[0].offset = temp->register_idx; reg.idx[1].offset = ~0u; + reg.idx_count = 1; function_location = spirv_compiler_get_current_function_location(compiler); vkd3d_spirv_begin_function_stream_insertion(builder, function_location);

1 0

Conor McCarthy : vkd3d-shader/spirv: Set the register index count in spirv_compiler_emit_default_control_point_phase().
by Alexandre Julliard 26 May '23

26 May '23

Module: vkd3d Branch: master Commit: 532fe0181863a2af3cf16b8cc5f7431d3fee5790 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/532fe0181863a2af3cf16b8cc5f74… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri May 26 16:36:19 2023 +1000 vkd3d-shader/spirv: Set the register index count in spirv_compiler_emit_default_control_point_phase(). --- libs/vkd3d-shader/spirv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 4bb4aabe..1c2a9190 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6309,6 +6309,7 @@ static void spirv_compiler_emit_default_control_point_phase(struct spirv_compile invocation.reg.idx[0].offset = ~0u; invocation.reg.idx[1].offset = ~0u; invocation.reg.idx[2].offset = ~0u; + invocation.reg.idx_count = 0; invocation.swizzle = VKD3D_SHADER_NO_SWIZZLE; memset(&input_reg, 0, sizeof(input_reg)); @@ -6316,6 +6317,7 @@ static void spirv_compiler_emit_default_control_point_phase(struct spirv_compile input_reg.data_type = VKD3D_DATA_FLOAT; input_reg.idx[0].rel_addr = &invocation; input_reg.idx[2].offset = ~0u; + input_reg.idx_count = 2; input_id = spirv_compiler_get_register_id(compiler, &input_reg); assert(input_signature->element_count == output_signature->element_count);

1 0

Conor McCarthy : vkd3d-shader/spirv: Use the register index count in I/O registers in vkd3d_symbol_make_register().
by Alexandre Julliard 26 May '23

26 May '23

Module: vkd3d Branch: master Commit: ec5f195b6b605bcb1ed77a38ae74de36c16d6c57 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ec5f195b6b605bcb1ed77a38ae74d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri May 26 16:39:49 2023 +1000 vkd3d-shader/spirv: Use the register index count in I/O registers in vkd3d_symbol_make_register(). --- libs/vkd3d-shader/spirv.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1c2a9190..b38896ae 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2060,11 +2060,8 @@ static void vkd3d_symbol_make_register(struct vkd3d_symbol *symbol, if (vkd3d_shader_register_is_input(reg) || vkd3d_shader_register_is_output(reg) || vkd3d_shader_register_is_patch_constant(reg)) { - unsigned int i; - for (i = 2; i > 0; --i) - if (reg->idx[i].offset != ~0u) - break; - symbol->key.reg.idx = reg->idx[i].offset; + symbol->key.reg.idx = reg->idx_count ? reg->idx[reg->idx_count - 1].offset : ~0u; + assert(!reg->idx_count || symbol->key.reg.idx != ~0u); } else if (reg->type != VKD3DSPR_IMMCONSTBUFFER) symbol->key.reg.idx = reg->idx[0].offset;

1 0