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

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

26 May '23

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: Use the register index count in spirv_compiler_get_register_name().
by Alexandre Julliard 26 May '23

26 May '23

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 aggregate register dereferences.
by Alexandre Julliard 26 May '23

26 May '23

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 default register dereferences.
by Alexandre Julliard 26 May '23

26 May '23

Module: vkd3d Branch: master Commit: d46250a59b56bf10ebbaef79a696890e807b6330 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d46250a59b56bf10ebbaef79a6968… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri May 26 16:44:01 2023 +1000 vkd3d-shader/spirv: Use the register index count in default 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 410f074b..25d75e69 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3378,11 +3378,11 @@ static void spirv_compiler_emit_dereference_register(struct spirv_compiler *comp } else { - if (reg->idx[1].rel_addr || (reg->idx[1].offset == ~0u && reg->idx[0].rel_addr)) + if (reg->idx_count && reg->idx[reg->idx_count - 1].rel_addr) FIXME("Relative addressing not implemented.\n"); /* Handle arrayed registers, e.g. v[3][0]. */ - if (reg->idx[1].offset != ~0u && !register_is_descriptor(reg)) + if (reg->idx_count > 1 && !register_is_descriptor(reg)) indexes[index_count++] = spirv_compiler_emit_register_addressing(compiler, &reg->idx[0]); }

1 0

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

26 May '23

Module: vkd3d Branch: master Commit: 178a7677e274a452ecb43cecdbf8de01a01c4308 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/178a7677e274a452ecb43cecdbf8d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri May 26 16:45:26 2023 +1000 vkd3d-shader/spirv: Use the register index count in shader_register_get_io_indices(). --- libs/vkd3d-shader/spirv.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 25d75e69..6fdb1cca 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4436,10 +4436,8 @@ static unsigned int shader_register_get_io_indices(const struct vkd3d_shader_reg array_sizes[0] = 0; array_sizes[1] = 0; element_idx = reg->idx[0].offset; - for (i = 1; i < 3; ++i) + for (i = 1; i < reg->idx_count; ++i) { - if (reg->idx[i].offset == ~0u) - break; array_sizes[1] = array_sizes[0]; array_sizes[0] = element_idx; element_idx = reg->idx[i].offset;

1 0

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

26 May '23

Module: vkd3d Branch: master Commit: 06dd0ccd4cbeb8effa4857adfaa5e879a91cf3e7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/06dd0ccd4cbeb8effa4857adfaa5e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri May 26 16:46:25 2023 +1000 vkd3d-shader/spirv: Use the register index count in I/O register assertions. --- libs/vkd3d-shader/spirv.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6fdb1cca..be7cec39 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4626,9 +4626,8 @@ static void spirv_compiler_emit_input_register(struct spirv_compiler *compiler, uint32_t write_mask; uint32_t input_id; - assert(!reg->idx[0].rel_addr); - assert(!reg->idx[1].rel_addr); - assert(reg->idx[1].offset == ~0u); + assert(!reg->idx_count || !reg->idx[0].rel_addr); + assert(reg->idx_count < 2); if (!(builtin = get_spirv_builtin_for_register(reg->type))) { @@ -4783,9 +4782,8 @@ static void spirv_compiler_emit_output_register(struct spirv_compiler *compiler, uint32_t write_mask; uint32_t output_id; - assert(!reg->idx[0].rel_addr); - assert(!reg->idx[1].rel_addr); - assert(reg->idx[1].offset == ~0u); + assert(!reg->idx_count || !reg->idx[0].rel_addr); + assert(reg->idx_count < 2); if (!(builtin = get_spirv_builtin_for_register(reg->type))) {

1 0

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

26 May '23

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 26 May '23

26 May '23

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

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

25 May '23

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

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

25 May '23

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