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

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

May 26, 2023

Module: vkd3d Branch: master Commit: a2b3f70d8ecf89ef086b1274accfe424f508c1a6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a2b3f70d8ecf89ef086b1274accfe… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri May 26 16:43:11 2023 +1000 vkd3d-shader/spirv: Use the register index count in aggregate register dereferences. --- 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 f21e24f2..410f074b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3368,9 +3368,9 @@ static void spirv_compiler_emit_dereference_register(struct spirv_compiler *comp else if (register_info->is_aggregate) { /* Indices for these are swapped compared to the generated SPIR-V. */ - if (reg->idx[2].offset != ~0u) + if (reg->idx_count > 2) indexes[index_count++] = spirv_compiler_emit_register_addressing(compiler, &reg->idx[1]); - if (reg->idx[1].offset != ~0u) + if (reg->idx_count > 1) indexes[index_count++] = spirv_compiler_emit_register_addressing(compiler, &reg->idx[0]); if (!index_count) /* A register sysval which is an array in SPIR-V, e.g. SAMPLEMASK. */

1 0

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

May 26, 2023

Module: vkd3d Branch: master Commit: ad088641344dafb449cff804a44b6d1b2245380e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ad088641344dafb449cff804a44b6… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri May 26 16:42:47 2023 +1000 vkd3d-shader/spirv: Use the register index count in spirv_compiler_get_register_name(). --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1b24629a..f21e24f2 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2881,7 +2881,7 @@ static bool spirv_compiler_get_register_name(char *buffer, unsigned int buffer_s { unsigned int idx; - idx = reg->idx[1].offset != ~0u ? reg->idx[1].offset : reg->idx[0].offset; + idx = reg->idx_count ? reg->idx[reg->idx_count - 1].offset : 0; switch (reg->type) { case VKD3DSPR_RESOURCE:

1 0

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

May 26, 2023

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

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

May 26, 2023

Module: vkd3d Branch: master Commit: b3927726cc6f7dfb7fc86d04cb7b58e8bbf4c7ac URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b3927726cc6f7dfb7fc86d04cb7b5… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri May 26 16:42:02 2023 +1000 vkd3d-shader/spirv: Use the register index count in non-I/O variable registers in vkd3d_symbol_make_register(). --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index b38896ae..1b24629a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2064,7 +2064,7 @@ static void vkd3d_symbol_make_register(struct vkd3d_symbol *symbol, assert(!reg->idx_count || symbol->key.reg.idx != ~0u); } else if (reg->type != VKD3DSPR_IMMCONSTBUFFER) - symbol->key.reg.idx = reg->idx[0].offset; + symbol->key.reg.idx = reg->idx_count ? reg->idx[0].offset : ~0u; } static void vkd3d_symbol_set_register_info(struct vkd3d_symbol *symbol,

1 0

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

May 26, 2023

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: Set the register index count in spirv_compiler_emit_dcl_indexable_temp().
by Alexandre Julliard May 26, 2023

May 26, 2023

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

May 26, 2023

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

May 26, 2023

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

Alex Henrie : setupapi: Use CRT functions for memory allocation where possible.
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: c293cd781fb4b330b7d93171501134f86a5138b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/c293cd781fb4b330b7d93171501134… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Apr 4 19:26:03 2023 -0600 setupapi: Use CRT functions for memory allocation where possible. The big win here is getting rid of the reimplementation of wcsdup. --- dlls/setupapi/devinst.c | 101 ++++++++++++++------------- dlls/setupapi/dialog.c | 14 ++-- dlls/setupapi/dirid.c | 27 +++----- dlls/setupapi/diskspace.c | 16 ++--- dlls/setupapi/fakedll.c | 55 +++++++-------- dlls/setupapi/install.c | 111 +++++++++++++++--------------- dlls/setupapi/misc.c | 23 +++---- dlls/setupapi/parser.c | 49 ++++++-------- dlls/setupapi/query.c | 44 ++++++------ dlls/setupapi/queue.c | 143 +++++++++++++++++++-------------------- dlls/setupapi/setupapi_private.h | 20 +----- dlls/setupapi/setupcab.c | 4 +- dlls/setupapi/stringtable.c | 2 +- 13 files changed, 284 insertions(+), 325 deletions(-)

1 0

Ziqing Hui : mf/tests: Add tests for MPEG4 media sink.
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: 678a815640586b9aad204a649689a065946f5b74 URL: https://gitlab.winehq.org/wine/wine/-/commit/678a815640586b9aad204a649689a0… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri May 12 10:06:47 2023 +0800 mf/tests: Add tests for MPEG4 media sink. --- dlls/mf/tests/mf.c | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 300 insertions(+)

1 0