- Wine-Commits - list.winehq.org

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: fd6fc3de590547b5c35be1f7718f9765d8ac4064 URL: https://gitlab.winehq.org/wine/wine/-/commit/fd6fc3de590547b5c35be1f7718f97… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Fri May 26 10:49:27 2023 +0200 po: Update Dutch translation. --- po/nl.po | 55 ++++++++++++------------------------------------------- 1 file changed, 12 insertions(+), 43 deletions(-) diff --git a/po/nl.po b/po/nl.po index 4c332f15104..2c190570586 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2023-05-03 16:25+0200\n" +"PO-Revision-Date: 2023-05-26 10:45+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -17213,38 +17213,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32: Verwijderen van DLL '%1' gelukt\n" #: programs/start/start.rc:56 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files\n" -#| "with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with " -#| "its\n" -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows\n" -#| "Explorer.\n" -#| "/exec Exec the specified file (for internal Wine usage).\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -17283,9 +17251,9 @@ msgstr "" "start [opties] document-naam\n" "\n" "Opties:\n" -"\"titel\" Specificeer de titel van het \"child\" venster.\n" -"/d map Start het programma in de gespecificeerde map.\n" -"/b Creeer geen nieuwe console voor het programma.\n" +"\"titel\" Bepaalt de titel van de onderliggende vensters.\n" +"/d map Start het programma vanaf de gegeven map.\n" +"/b Maak geen nieuwe console voor het programma.\n" "/i Start het programma met verse omgevingsvariabelen.\n" "/min Start het programma geminimaliseerd op.\n" "/max Start het programma gemaximaliseerd op.\n" @@ -17293,16 +17261,17 @@ msgstr "" "/normal Start het programma met normale prioriteit op.\n" "/high Start het programma met hoge prioriteit op.\n" "/realtime Start het programma met \"realtime\" prioriteit op.\n" -"/abovenormal Start het programma in \"abovenormal\" prioriteit op.\n" -"/belownormal Start het programma in \"belownormal\" prioriteit op.\n" -"/node n Start het programma op de gespecificeerde NUMA node.\n" -"/affinity mask Start het program met het gespecificeerde affiniteitsmasker.\n" -"/wait Wacht tot het gestarte programma beeindigd is, dan afsluiten\n" -" met de exit code.\n" +"/abovenormal Start het programma met \"abovenormal\" prioriteit op.\n" +"/belownormal Start het programma met \"belownormal\" prioriteit op.\n" +"/node n Start het programma op de gegeven NUMA node.\n" +"/affinity mask Start het program met het gegeven affiniteitsmasker.\n" +"/machine arch Forceer de gegeven architectuur (x86,arm,amd64,arm64).\n" +"/wait Wacht tot het programma is beëindigd en sluit af met\n" +" zijn exit code.\n" "/unix Gebruik een Unix bestandsnaam en start het bestand zoals\n" " Windows Verkenner.\n" "/exec Voer het opgegeven bestand uit (intern gebruikt in Wine).\n" -"/ProgIDOpen Open een document met het specificeerde progID.\n" +"/ProgIDOpen Open een document met het gegeven progID.\n" "/? Toon deze hulp en eindig.\n" #: programs/start/start.rc:58

1 0

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

May 26, 2023

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

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

May 26, 2023

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

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

May 26, 2023

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

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

May 26, 2023

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_mod().
by Alexandre Julliard May 26, 2023

May 26, 2023

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

Henri Verbeet : vkd3d: Avoid redundantly initialising "descriptors" in d3d12_desc_flush_vk_heap_updates_locked().
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: vkd3d Branch: master Commit: 133421a38c9ba7fe2c739a3c660deca1f19e1062 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/133421a38c9ba7fe2c739a3c660de… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 26 11:30:35 2023 +0200 vkd3d: Avoid redundantly initialising "descriptors" in d3d12_desc_flush_vk_heap_updates_locked(). As pointed out by Andrey Gusev. --- libs/vkd3d/resource.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 213b2dbb..ea7b6859 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2334,8 +2334,6 @@ void d3d12_desc_flush_vk_heap_updates_locked(struct d3d12_descriptor_heap *descr if ((i = vkd3d_atomic_exchange(&descriptor_heap->dirty_list_head, UINT_MAX)) == UINT_MAX) return; - descriptors = (struct d3d12_desc *)descriptor_heap->descriptors; - writes.null_vk_cbv_info.buffer = VK_NULL_HANDLE; writes.null_vk_cbv_info.offset = 0; writes.null_vk_cbv_info.range = VK_WHOLE_SIZE;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_div().
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: vkd3d Branch: master Commit: c8b7dbebe4e866dd2261d32233e3458c9efdb0bf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c8b7dbebe4e866dd2261d32233e34… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 11 18:52:16 2022 -0600 vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_div(). --- libs/vkd3d-shader/hlsl_constant_ops.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 80af9b8f..a60ced01 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -293,16 +293,17 @@ static bool fold_nequal(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, c return true; } -static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, - struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +static bool fold_div(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) { @@ -310,13 +311,13 @@ static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, case HLSL_TYPE_HALF: if (ctx->profile->major_version >= 4 && src2->value.u[k].f == 0) { - hlsl_warning(ctx, &dst->node.loc, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO, + hlsl_warning(ctx, loc, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO, "Floating point division by zero."); } - dst->value.u[k].f = src1->value.u[k].f / src2->value.u[k].f; - if (ctx->profile->major_version < 4 && !isfinite(dst->value.u[k].f)) + dst->u[k].f = src1->value.u[k].f / src2->value.u[k].f; + if (ctx->profile->major_version < 4 && !isfinite(dst->u[k].f)) { - hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, "Infinities and NaNs are not allowed by the shader model."); } break; @@ -324,37 +325,37 @@ static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, case HLSL_TYPE_DOUBLE: if (src2->value.u[k].d == 0) { - hlsl_warning(ctx, &dst->node.loc, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO, + hlsl_warning(ctx, loc, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO, "Floating point division by zero."); } - dst->value.u[k].d = src1->value.u[k].d / src2->value.u[k].d; + dst->u[k].d = src1->value.u[k].d / src2->value.u[k].d; break; case HLSL_TYPE_INT: if (src2->value.u[k].i == 0) { - hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_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 = INT_MIN; + dst->u[k].i = INT_MIN; 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, + 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 division for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + FIXME("Fold division for type %s.\n", debug_hlsl_type(ctx, dst_type)); return false; } } @@ -600,7 +601,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, break; case HLSL_OP2_DIV: - success = fold_div(ctx, res, arg1, arg2); + success = fold_div(ctx, &res->value, instr->data_type, arg1, arg2, &instr->loc); break; case HLSL_OP2_MOD:

1 0

Conor McCarthy : vkd3d-shader/spirv: Use the register index count in I/O relative address assertions.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: vkd3d Branch: master Commit: 4a64cf74c3445cf2744058f5d69ffc9e701f63ce URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4a64cf74c3445cf2744058f5d69ff… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri May 26 17:05:38 2023 +1000 vkd3d-shader/spirv: Use the register index count in I/O relative address assertions. --- libs/vkd3d-shader/spirv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index be7cec39..29423028 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4469,8 +4469,8 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler, unsigned int element_idx; uint32_t i, index; - assert(!reg->idx[0].rel_addr); - assert(!reg->idx[1].rel_addr); + assert(!reg->idx_count || !reg->idx[0].rel_addr); + assert(reg->idx_count < 2 || !reg->idx[1].rel_addr); shader_signature = reg->type == VKD3DSPR_PATCHCONST ? &compiler->patch_constant_signature : &compiler->input_signature;

1 0

Conor McCarthy : vkd3d-shader/spirv: Use the register index count in shader_register_clone_relative_addresses().
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: vkd3d Branch: master Commit: f4778b727d1815f1f6e3e4609c7d87aa6fce553e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f4778b727d1815f1f6e3e4609c7d8… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri May 26 17:06:16 2023 +1000 vkd3d-shader/spirv: Use the register index count in shader_register_clone_relative_addresses(). --- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 409d759c..1fef3216 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1712,7 +1712,7 @@ static bool shader_register_clone_relative_addresses(struct vkd3d_shader_registe { unsigned int i; - for (i = 0; i < ARRAY_SIZE(reg->idx) && reg->idx[i].offset != ~0u; ++i) + for (i = 0; i < reg->idx_count; ++i) { if (!reg->idx[i].rel_addr) continue;

1 0