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

Alexandre Julliard : kernelbase: Reimplement CompareStringEx using the sortkey generation code.
by Alexandre Julliard May 31, 2022

May 31, 2022

Module: wine Branch: master Commit: d8c973ad95ba5e8a9a51df0dd9be587950179ec3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8c973ad95ba5e8a9a51df0d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 30 22:38:28 2022 +0200 kernelbase: Reimplement CompareStringEx using the sortkey generation code. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 117 +++++++++------------ dlls/kernelbase/locale.c | 237 +++++++++++++++++-------------------------- 2 files changed, 142 insertions(+), 212 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d8c973ad95ba5e8a9a51…

1 0

Jinoh Kang : ntdll: Implement __fastfail().
by Alexandre Julliard May 31, 2022

May 31, 2022

Module: wine Branch: master Commit: c4c9a6951be4299850ca220450b21eeb8843fde5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4c9a6951be4299850ca2204… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sun Dec 5 19:56:22 2021 +0900 ntdll: Implement __fastfail(). __fastfail() is used by the Visual C++ runtime and Windows system libraries to signal that the in-process state is corrupted and unrecoverable. If __fastfail() is invoked, the NT kernel raises a second-chance non-continuable exception STATUS_STACK_BUFFER_OVERRUN. This quickly terminates the process, bypassing all in-process exception handlers (since they all rely on the potentially corrupted process state). Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/tests/exception.c | 1 - dlls/ntdll/unix/signal_arm.c | 19 +++++++++++++++++-- dlls/ntdll/unix/signal_arm64.c | 16 ++++++++++++++++ dlls/ntdll/unix/signal_i386.c | 8 ++++++++ dlls/ntdll/unix/signal_x86_64.c | 8 ++++++++ 5 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 0086b18d678..3e76b001147 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8466,7 +8466,6 @@ static void subtest_fastfail(unsigned int code) } while (de.dwDebugEventCode != EXIT_PROCESS_DEBUG_EVENT); - todo_wine ok(had_ff || broken(had_se) /* Win7 */, "fast fail did not occur\n"); wait_child_process( pi.hProcess ); diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 1fea76f6563..ead14303436 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -812,13 +812,28 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) switch (get_trap_code(signal, context)) { case TRAP_ARM_PRIVINFLT: /* Invalid opcode exception */ - if (*(WORD *)PC_sig(context) == 0xdefe) /* breakpoint */ + switch (*(WORD *)PC_sig(context)) { + case 0xdefb: /* __fastfail */ + { + CONTEXT ctx; + save_context( &ctx, sigcontext ); + rec.ExceptionCode = STATUS_STACK_BUFFER_OVERRUN; + rec.ExceptionAddress = (void *)ctx.Pc; + rec.ExceptionFlags = EH_NONCONTINUABLE; + rec.NumberParameters = 1; + rec.ExceptionInformation[0] = ctx.R0; + NtRaiseException( &rec, &ctx, FALSE ); + return; + } + case 0xdefe: /* breakpoint */ rec.ExceptionCode = EXCEPTION_BREAKPOINT; rec.NumberParameters = 1; break; + default: + rec.ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; + break; } - rec.ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; break; case TRAP_ARM_PAGEFLT: /* Page fault */ rec.NumberParameters = 2; diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 1df97f16f13..45cb3d1bf13 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -908,6 +908,7 @@ static void bus_handler( int signal, siginfo_t *siginfo, void *sigcontext ) static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { 0 }; + ucontext_t *context = sigcontext; switch (siginfo->si_code) { @@ -916,6 +917,21 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; case TRAP_BRKPT: default: + /* debug exceptions do not update ESR on Linux, so we fetch the instruction directly. */ + if (!(PSTATE_sig( context ) & 0x10) && /* AArch64 (not WoW) */ + !(PC_sig( context ) & 3) && + *(ULONG *)PC_sig( context ) == 0xd43e0060UL) /* brk #0xf003 -> __fastfail */ + { + CONTEXT ctx; + save_context( &ctx, sigcontext ); + rec.ExceptionCode = STATUS_STACK_BUFFER_OVERRUN; + rec.ExceptionAddress = (void *)ctx.Pc; + rec.ExceptionFlags = EH_NONCONTINUABLE; + rec.NumberParameters = 1; + rec.ExceptionInformation[0] = ctx.u.X[0]; + NtRaiseException( &rec, &ctx, FALSE ); + return; + } rec.ExceptionCode = EXCEPTION_BREAKPOINT; rec.NumberParameters = 1; break; diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index e2a6148d609..7be0c39c424 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1676,6 +1676,14 @@ static BOOL handle_interrupt( unsigned int interrupt, ucontext_t *sigcontext, vo switch(interrupt) { + case 0x29: + /* __fastfail: process state is corrupted */ + rec->ExceptionCode = STATUS_STACK_BUFFER_OVERRUN; + rec->ExceptionFlags = EH_NONCONTINUABLE; + rec->NumberParameters = 1; + rec->ExceptionInformation[0] = context->Ecx; + NtRaiseException( rec, context, FALSE ); + return TRUE; case 0x2d: if (!is_wow64) { diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index e3179e2f1b0..6c87e347eac 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2486,6 +2486,14 @@ static inline BOOL handle_interrupt( ucontext_t *sigcontext, EXCEPTION_RECORD *r switch (ERROR_sig(sigcontext) >> 3) { + case 0x29: + /* __fastfail: process state is corrupted */ + rec->ExceptionCode = STATUS_STACK_BUFFER_OVERRUN; + rec->ExceptionFlags = EH_NONCONTINUABLE; + rec->NumberParameters = 1; + rec->ExceptionInformation[0] = context->Rcx; + NtRaiseException( rec, context, FALSE ); + return TRUE; case 0x2c: rec->ExceptionCode = STATUS_ASSERTION_FAILURE; break;

1 0

Francois Gouget : testbot/orm: Don't assume that key columns don't need conversion.
by Alexandre Julliard May 31, 2022

May 31, 2022

Module: tools Branch: master Commit: 1bbff054090a6b3824d6f9ef9fe62be98f0b31fe URL: https://source.winehq.org/git/tools.git/?a=commit;h=1bbff054090a6b3824d6f9e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 31 19:15:49 2022 +0200 testbot/orm: Don't assume that key columns don't need conversion. This allows using booleans and timestamps in the key columns. It also makes GetUpdateData() consistent with GetInsertData(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 94e4be6..940d37f 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -619,7 +619,7 @@ sub GetUpdateData($$$) { foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) { - push @Data, $Item->GetColValue($ColName); + push @Data, $self->ToDb($Item->GetColValue($ColName), $PropertyDescriptor); } } } @@ -663,6 +663,7 @@ sub SaveCollection($$) die "Sequence property spans multiple columns"; } + # No FromDb() conversion needed for integers $Item->PutColValue(@{$ColNames}[0], $Db->{'mysql_insertid'}); $Collection->KeyChanged($Key, $Item->GetKey()); }

1 0

Francois Gouget : testbot/build: Run make depend before rebuilding the tests.
by Alexandre Julliard May 31, 2022

May 31, 2022

Module: tools Branch: master Commit: adab4df2ca7938b3210fb235dc6b34628b85d993 URL: https://source.winehq.org/git/tools.git/?a=commit;h=adab4df2ca7938b3210fb23… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 31 19:15:40 2022 +0200 testbot/build: Run make depend before rebuilding the tests. 'make buildtest' only generates the headers needed by the tests. So it's possible for a patch to introduce a dependency on a header that was not build by Reconfig. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 4 ++-- testbot/lib/Build/Utils.pm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 23ab685..8502f21 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -167,8 +167,8 @@ if ($DataDir =~ /'/) my $Impacts = ApplyPatch("wine", $PatchFile); if (!$Impacts or - !BuildWine($TaskMissions, 0, "exe32", undef, "buildtests") or - !BuildWine($TaskMissions, 0, "exe64", undef, "buildtests")) + !BuildWine($TaskMissions, 0, "exe32", undef, ["depend", "buildtests"]) or + !BuildWine($TaskMissions, 0, "exe64", undef, ["depend", "buildtests"])) { exit(1); } diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 9e73cba..8a84f5e 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -330,7 +330,7 @@ our $TRY_WERROR = 2; sub BuildWine($$$$;$) { my ($TaskMissions, $Flags, $Build, $Configure, $Targets) = @_; - $Targets ||= ""; + $Targets ||= [""]; return 1 if (!$TaskMissions->{Builds}->{$Build}); # Rebuild from scratch to make sure cruft will not accumulate @@ -344,14 +344,14 @@ sub BuildWine($$$$;$) { $Rc = system("cd '$DataDir/wine-$Build' && set -x && ". "time ../wine/configure $Configure --enable-werror && ". - "time make -j$CPUCount $Targets"); + join(" && ", map { "time make -j$CPUCount $_" } @$Targets)); LogMsg "With -Werror the $Build Wine build fails\n" if ($Rc); } if ($Rc) { $Rc = system("cd '$DataDir/wine-$Build' && set -x && ". (defined $Configure ? "time ../wine/configure $Configure && " : ""). - "time make -j$CPUCount $Targets"); + join(" && ", map { "time make -j$CPUCount $_" } @$Targets)); } if ($Rc) {

1 0

Giovanni Mascellani : tests/shader_runner: Allow probing a single component.
by Alexandre Julliard May 31, 2022

May 31, 2022

Module: vkd3d Branch: master Commit: 6ff6cb4ed29126cf7d3ba1e96ee5841c94cdacee URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6ff6cb4ed29126cf7d3ba1e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue May 17 15:45:42 2022 +0200 tests/shader_runner: Allow probing a single component. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 34 ---------------------------------- tests/shader_runner.c | 35 ++++++++++++++++++++++++++--------- tests/utils.h | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 43 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 3c4a91e2..ec5cfb20 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -278,45 +278,11 @@ static uint64_t get_readback_uint64(struct resource_readback *rb, unsigned int x return *(uint64_t *)get_readback_data(rb, x, y, 0, sizeof(uint64_t)); } -static float get_readback_float(struct resource_readback *rb, unsigned int x, unsigned int y) -{ - return *(float *)get_readback_data(rb, x, y, 0, sizeof(float)); -} - static const struct uvec4 *get_readback_uvec4(struct resource_readback *rb, unsigned int x, unsigned int y) { return get_readback_data(rb, x, y, 0, sizeof(struct uvec4)); } -#define check_readback_data_float(a, b, c, d) check_readback_data_float_(__LINE__, a, b, c, d) -static void check_readback_data_float_(unsigned int line, struct resource_readback *rb, - const RECT *rect, float expected, unsigned int max_diff) -{ - RECT r = {0, 0, rb->width, rb->height}; - unsigned int x = 0, y; - bool all_match = true; - float got = 0; - - if (rect) - r = *rect; - - for (y = r.top; y < r.bottom; ++y) - { - for (x = r.left; x < r.right; ++x) - { - got = get_readback_float(rb, x, y); - if (!compare_float(got, expected, max_diff)) - { - all_match = false; - break; - } - } - if (!all_match) - break; - } - ok_(line)(all_match, "Got %.8e, expected %.8e at (%u, %u).\n", got, expected, x, y); -} - #define check_sub_resource_float(a, b, c, d, e, f) check_sub_resource_float_(__LINE__, a, b, c, d, e, f) static void check_sub_resource_float_(unsigned int line, ID3D12Resource *texture, unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 143d0c72..05e2a8a4 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -413,7 +413,6 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) { unsigned int left, top, right, bottom, ulps; struct resource_readback *rb; - struct vec4 v; int ret, len; RECT rect; @@ -439,17 +438,35 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) fatal_error("Malformed probe arguments '%s'.\n", line); } - if (!match_string(line, "rgba", &line)) - fatal_error("Malformed probe arguments '%s'.\n", line); + rb = runner->ops->get_rt_readback(runner); + + if (match_string(line, "rgba", &line)) + { + struct vec4 v; - ret = sscanf(line, "( %f , %f , %f , %f ) %u", &v.x, &v.y, &v.z, &v.w, &ulps); - if (ret < 4) + ret = sscanf(line, "( %f , %f , %f , %f ) %u", &v.x, &v.y, &v.z, &v.w, &ulps); + if (ret < 4) + fatal_error("Malformed probe arguments '%s'.\n", line); + if (ret < 5) + ulps = 0; + todo_if(runner->is_todo) check_readback_data_vec4(rb, &rect, &v, ulps); + } + else if (match_string(line, "r", &line)) + { + float expect; + + ret = sscanf(line, "( %f ) %u", &expect, &ulps); + if (ret < 1) + fatal_error("Malformed probe arguments '%s'.\n", line); + if (ret < 2) + ulps = 0; + todo_if(runner->is_todo) check_readback_data_float(rb, &rect, expect, ulps); + } + else + { fatal_error("Malformed probe arguments '%s'.\n", line); - if (ret < 5) - ulps = 0; + } - rb = runner->ops->get_rt_readback(runner); - todo_if(runner->is_todo) check_readback_data_vec4(rb, &rect, &v, ulps); runner->ops->release_readback(runner, rb); } else if (match_string(line, "uniform", &line)) diff --git a/tests/utils.h b/tests/utils.h index c7d6d772..82f0fc35 100644 --- a/tests/utils.h +++ b/tests/utils.h @@ -120,11 +120,45 @@ static void *get_readback_data(const struct resource_readback *rb, return &((uint8_t *)rb->data)[slice_pitch * z + rb->row_pitch * y + x * element_size]; } +static float get_readback_float(const struct resource_readback *rb, unsigned int x, unsigned int y) +{ + return *(float *)get_readback_data(rb, x, y, 0, sizeof(float)); +} + static const struct vec4 *get_readback_vec4(const struct resource_readback *rb, unsigned int x, unsigned int y) { return get_readback_data(rb, x, y, 0, sizeof(struct vec4)); } +#define check_readback_data_float(a, b, c, d) check_readback_data_float_(__LINE__, a, b, c, d) +static inline void check_readback_data_float_(unsigned int line, const struct resource_readback *rb, + const RECT *rect, float expected, unsigned int max_diff) +{ + RECT r = {0, 0, rb->width, rb->height}; + unsigned int x = 0, y; + bool all_match = true; + float got = 0; + + if (rect) + r = *rect; + + for (y = r.top; y < r.bottom; ++y) + { + for (x = r.left; x < r.right; ++x) + { + got = get_readback_float(rb, x, y); + if (!compare_float(got, expected, max_diff)) + { + all_match = false; + break; + } + } + if (!all_match) + break; + } + ok_(line)(all_match, "Got %.8e, expected %.8e at (%u, %u).\n", got, expected, x, y); +} + #define check_readback_data_vec4(a, b, c, d) check_readback_data_vec4_(__LINE__, a, b, c, d) static inline void check_readback_data_vec4_(unsigned int line, const struct resource_readback *rb, const RECT *rect, const struct vec4 *expected, unsigned int max_diff)

1 0

Zebediah Figura : tests/shader_runner: Use the resource_readback structure in the Vulkan shader runner.
by Alexandre Julliard May 31, 2022

May 31, 2022

Module: vkd3d Branch: master Commit: 1e8e0650c99c320c53271efebac9a23b41a0ff78 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1e8e0650c99c320c53271ef… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 17 15:45:39 2022 +0200 tests/shader_runner: Use the resource_readback structure in the Vulkan shader runner. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner_vulkan.c | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index 5d4b65cf..4ef371ac 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -825,12 +825,19 @@ out: return ret; } -static const struct vec4 *get_readback_vec4(const uint8_t *data, unsigned int row_pitch, unsigned int x, unsigned int y) +struct vulkan_resource_readback { - return (struct vec4 *)(data + y * row_pitch + x * sizeof(struct vec4)); + struct resource_readback rb; + VkDeviceMemory memory; + VkBuffer buffer; +}; + +static const struct vec4 *get_readback_vec4(const struct resource_readback *rb, unsigned int x, unsigned int y) +{ + return (struct vec4 *)((uint8_t *)rb->data + y * rb->row_pitch + x * sizeof(struct vec4)); } -static void check_readback_data_vec4(const uint8_t *data, unsigned int row_pitch, +static void check_readback_data_vec4(const struct resource_readback *rb, const RECT *rect, const struct vec4 *expected, unsigned int max_diff) { unsigned int x = 0, y = 0; @@ -841,7 +848,7 @@ static void check_readback_data_vec4(const uint8_t *data, unsigned int row_pitch { for (x = rect->left; x < rect->right; ++x) { - got = *get_readback_vec4(data, row_pitch, x, y); + got = *get_readback_vec4(rb, x, y); if (!compare_vec4(&got, expected, max_diff)) { all_match = false; @@ -858,17 +865,18 @@ static void check_readback_data_vec4(const uint8_t *data, unsigned int row_pitch static void vulkan_runner_probe_vec4(struct shader_runner *r, const RECT *rect, const struct vec4 *v, unsigned int ulps) { struct vulkan_shader_runner *runner = vulkan_shader_runner(r); + struct vulkan_resource_readback rb; VkDevice device = runner->device; VkBufferImageCopy region = {0}; - VkBuffer staging_buffer; - unsigned int row_pitch; - VkDeviceMemory memory; - void *data; - row_pitch = RENDER_TARGET_WIDTH * sizeof(struct vec4); + rb.rb.width = RENDER_TARGET_WIDTH; + rb.rb.height = RENDER_TARGET_HEIGHT; + rb.rb.depth = 1; + + rb.rb.row_pitch = rb.rb.width * sizeof(struct vec4); - staging_buffer = create_buffer(runner, row_pitch * RENDER_TARGET_HEIGHT, - VK_BUFFER_USAGE_TRANSFER_DST_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &memory); + rb.buffer = create_buffer(runner, rb.rb.row_pitch * RENDER_TARGET_HEIGHT, + VK_BUFFER_USAGE_TRANSFER_DST_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &rb.memory); begin_command_buffer(runner); @@ -882,19 +890,19 @@ static void vulkan_runner_probe_vec4(struct shader_runner *r, const RECT *rect, region.imageExtent.depth = 1; VK_CALL(vkCmdCopyImageToBuffer(runner->cmd_buffer, runner->render_target, - VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, staging_buffer, 1, &region)); + VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, rb.buffer, 1, &region)); transition_image_layout(runner, runner->render_target, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); end_command_buffer(runner); - VK_CALL(vkMapMemory(device, memory, 0, VK_WHOLE_SIZE, 0, &data)); - todo_if (runner->r.is_todo) check_readback_data_vec4(data, row_pitch, rect, v, ulps); - VK_CALL(vkUnmapMemory(device, memory)); + VK_CALL(vkMapMemory(device, rb.memory, 0, VK_WHOLE_SIZE, 0, &rb.rb.data)); + todo_if (runner->r.is_todo) check_readback_data_vec4(&rb.rb, rect, v, ulps); + VK_CALL(vkUnmapMemory(device, rb.memory)); - VK_CALL(vkFreeMemory(device, memory, NULL)); - VK_CALL(vkDestroyBuffer(device, staging_buffer, NULL)); + VK_CALL(vkFreeMemory(device, rb.memory, NULL)); + VK_CALL(vkDestroyBuffer(device, rb.buffer, NULL)); } static const struct shader_runner_ops vulkan_runner_ops =

1 0

Zebediah Figura : tests/shader_runner: Move the check_readback_data_vec4() call to shader_runner.c.
by Alexandre Julliard May 31, 2022

May 31, 2022

Module: vkd3d Branch: master Commit: 4a9d675c494b470bdacb10b8e7c57f0a7dcbcac1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4a9d675c494b470bdacb10b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 17 15:45:41 2022 +0200 tests/shader_runner: Move the check_readback_data_vec4() call to shader_runner.c. Split the probe_vec4() directive into get_rt_readback() and release_readback(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner.c | 9 ++++++++- tests/shader_runner.h | 3 ++- tests/shader_runner_d3d11.c | 24 +++++++++++------------- tests/shader_runner_d3d12.c | 24 +++++++++++++++++------- tests/shader_runner_d3d9.c | 25 +++++++++++-------------- tests/shader_runner_vulkan.c | 40 +++++++++++++++++++++++++--------------- 6 files changed, 74 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=4a9d675c494b470bdac…

1 0

Zebediah Figura : tests/shader_runner: Use the common resource_readback structure in d3d9 and d3d11 readback structures.
by Alexandre Julliard May 31, 2022

May 31, 2022

Module: vkd3d Branch: master Commit: ccdb702d5387685521fb4ac395155957fa39e7f5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ccdb702d5387685521fb4ac… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 17 15:45:38 2022 +0200 tests/shader_runner: Use the common resource_readback structure in d3d9 and d3d11 readback structures. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12_test_utils.h | 9 --------- tests/shader_runner_d3d11.c | 23 +++++++++++++++-------- tests/shader_runner_d3d9.c | 23 +++++++++++++++-------- tests/utils.h | 10 ++++++++++ 4 files changed, 40 insertions(+), 25 deletions(-) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 061931c2..d8220409 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -411,15 +411,6 @@ static inline unsigned int format_block_height(DXGI_FORMAT format) } } -struct resource_readback -{ - uint64_t width; - unsigned int height; - unsigned int depth; - uint64_t row_pitch; - void *data; -}; - struct d3d12_resource_readback { struct resource_readback rb; diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 9d1ed09b..c8304ce6 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -540,15 +540,16 @@ static bool d3d11_runner_draw(struct shader_runner *r, return true; } -struct resource_readback +struct d3d11_resource_readback { + struct resource_readback rb; ID3D11Resource *resource; - D3D11_MAPPED_SUBRESOURCE map_desc; }; -static void init_readback(struct d3d11_shader_runner *runner, struct resource_readback *rb) +static void init_readback(struct d3d11_shader_runner *runner, struct d3d11_resource_readback *rb) { D3D11_TEXTURE2D_DESC texture_desc; + D3D11_MAPPED_SUBRESOURCE map_desc; HRESULT hr; ID3D11Texture2D_GetDesc(runner->rt, &texture_desc); @@ -560,11 +561,17 @@ static void init_readback(struct d3d11_shader_runner *runner, struct resource_re ok(hr == S_OK, "Failed to create texture, hr %#lx.\n", hr); ID3D11DeviceContext_CopyResource(runner->immediate_context, rb->resource, (ID3D11Resource *)runner->rt); - hr = ID3D11DeviceContext_Map(runner->immediate_context, rb->resource, 0, D3D11_MAP_READ, 0, &rb->map_desc); + hr = ID3D11DeviceContext_Map(runner->immediate_context, rb->resource, 0, D3D11_MAP_READ, 0, &map_desc); ok(hr == S_OK, "Failed to map texture, hr %#lx.\n", hr); + + rb->rb.data = map_desc.pData; + rb->rb.row_pitch = map_desc.RowPitch; + rb->rb.width = texture_desc.Width; + rb->rb.height = texture_desc.Height; + rb->rb.depth = 1; } -static void release_readback(struct d3d11_shader_runner *runner, struct resource_readback *rb) +static void release_readback(struct d3d11_shader_runner *runner, struct d3d11_resource_readback *rb) { ID3D11DeviceContext_Unmap(runner->immediate_context, rb->resource, 0); ID3D11Resource_Release(rb->resource); @@ -572,7 +579,7 @@ static void release_readback(struct d3d11_shader_runner *runner, struct resource static const struct vec4 *get_readback_vec4(struct resource_readback *rb, unsigned int x, unsigned int y) { - return (struct vec4 *)((BYTE *)rb->map_desc.pData + y * rb->map_desc.RowPitch) + x; + return (struct vec4 *)((BYTE *)rb->data + y * rb->row_pitch) + x; } static void check_readback_data_vec4(struct resource_readback *rb, @@ -603,10 +610,10 @@ static void check_readback_data_vec4(struct resource_readback *rb, static void d3d11_runner_probe_vec4(struct shader_runner *r, const RECT *rect, const struct vec4 *v, unsigned int ulps) { struct d3d11_shader_runner *runner = d3d11_shader_runner(r); - struct resource_readback rb; + struct d3d11_resource_readback rb; init_readback(runner, &rb); - check_readback_data_vec4(&rb, rect, v, ulps); + check_readback_data_vec4(&rb.rb, rect, v, ulps); release_readback(runner, &rb); } diff --git a/tests/shader_runner_d3d9.c b/tests/shader_runner_d3d9.c index f2875d42..14f8184a 100644 --- a/tests/shader_runner_d3d9.c +++ b/tests/shader_runner_d3d9.c @@ -449,14 +449,15 @@ static bool d3d9_runner_draw(struct shader_runner *r, return true; } -struct resource_readback +struct d3d9_resource_readback { + struct resource_readback rb; IDirect3DSurface9 *surface; - D3DLOCKED_RECT rect; }; -static void init_readback(struct d3d9_shader_runner *runner, struct resource_readback *rb) +static void init_readback(struct d3d9_shader_runner *runner, struct d3d9_resource_readback *rb) { + D3DLOCKED_RECT map_desc; D3DSURFACE_DESC desc; HRESULT hr; @@ -469,13 +470,19 @@ static void init_readback(struct d3d9_shader_runner *runner, struct resource_rea hr = IDirect3DDevice9Ex_GetRenderTargetData(runner->device, runner->rt, rb->surface); ok(hr == D3D_OK, "Failed to get render target data, hr %#lx.\n", hr); - hr = IDirect3DSurface9_LockRect(rb->surface, &rb->rect, NULL, D3DLOCK_READONLY); + hr = IDirect3DSurface9_LockRect(rb->surface, &map_desc, NULL, D3DLOCK_READONLY); ok(hr == D3D_OK, "Failed to lock surface, hr %#lx.\n", hr); + + rb->rb.data = map_desc.pBits; + rb->rb.row_pitch = map_desc.Pitch; + rb->rb.width = desc.Width; + rb->rb.height = desc.Height; + rb->rb.depth = 1; } static const struct vec4 *get_readback_vec4(const struct resource_readback *rb, unsigned int x, unsigned int y) { - return (struct vec4 *)((BYTE *)rb->rect.pBits + y * rb->rect.Pitch + x * sizeof(struct vec4)); + return (struct vec4 *)((BYTE *)rb->data + y * rb->row_pitch + x * sizeof(struct vec4)); } static void check_readback_data_vec4(struct resource_readback *rb, @@ -503,7 +510,7 @@ static void check_readback_data_vec4(struct resource_readback *rb, got.x, got.y, got.z, got.w, expected->x, expected->y, expected->z, expected->w, x, y); } -static void release_readback(struct resource_readback *rb) +static void release_readback(struct d3d9_resource_readback *rb) { IDirect3DSurface9_UnlockRect(rb->surface); IDirect3DSurface9_Release(rb->surface); @@ -512,10 +519,10 @@ static void release_readback(struct resource_readback *rb) static void d3d9_runner_probe_vec4(struct shader_runner *r, const RECT *rect, const struct vec4 *v, unsigned int ulps) { struct d3d9_shader_runner *runner = d3d9_shader_runner(r); - struct resource_readback rb; + struct d3d9_resource_readback rb; init_readback(runner, &rb); - check_readback_data_vec4(&rb, rect, v, ulps); + check_readback_data_vec4(&rb.rb, rect, v, ulps); release_readback(&rb); } diff --git a/tests/utils.h b/tests/utils.h index 563f0b0f..2cb9511f 100644 --- a/tests/utils.h +++ b/tests/utils.h @@ -21,6 +21,7 @@ #include <limits.h> #include <stdbool.h> +#include <stdint.h> #include <stdlib.h> struct vec2 @@ -33,6 +34,15 @@ struct vec4 float x, y, z, w; }; +struct resource_readback +{ + uint64_t width; + unsigned int height; + unsigned int depth; + uint64_t row_pitch; + void *data; +}; + static inline bool vkd3d_array_reserve(void **elements, size_t *capacity, size_t element_count, size_t element_size) { size_t new_capacity, max_capacity;

1 0

Zebediah Figura : tests: Separate generic and d3d12-specific readback fields.
by Alexandre Julliard May 31, 2022

May 31, 2022

Module: vkd3d Branch: master Commit: b5e773058ca69d22b769a82253ac3f6d4d55d54c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b5e773058ca69d22b769a82… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 17 15:45:37 2022 +0200 tests: Separate generic and d3d12-specific readback fields. Move the "resource" field to a new "d3d12_resource_readback" structure encapsulating struct resource_readback. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 602 ++++++++++++++++++++++---------------------- tests/d3d12_test_utils.h | 45 ++-- tests/shader_runner_d3d12.c | 4 +- 3 files changed, 328 insertions(+), 323 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=b5e773058ca69d22b76…

1 0

Zebediah Figura : tests: Move check_readback_data_vec4() to utils.h.
by Alexandre Julliard May 31, 2022

May 31, 2022

Module: vkd3d Branch: master Commit: e6ea409bbfb53b8efabfe42a3d446c0200f5668d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e6ea409bbfb53b8efabfe42… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 17 15:45:40 2022 +0200 tests: Move check_readback_data_vec4() to utils.h. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12_test_utils.h | 42 ------------------------------------------ tests/shader_runner_d3d11.c | 30 ------------------------------ tests/shader_runner_d3d9.c | 30 ------------------------------ tests/shader_runner_vulkan.c | 32 +------------------------------- tests/utils.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 44 insertions(+), 133 deletions(-) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index d8220409..c25449e6 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -506,24 +506,12 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi assert_that(hr == S_OK, "Failed to map readback buffer, hr %#x.\n", hr); } -static void *get_readback_data(struct resource_readback *rb, - unsigned int x, unsigned int y, unsigned int z, size_t element_size) -{ - unsigned int slice_pitch = rb->row_pitch * rb->height; - return &((BYTE *)rb->data)[slice_pitch * z + rb->row_pitch * y + x * element_size]; -} - static unsigned int get_readback_uint(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) { return *(unsigned int *)get_readback_data(rb, x, y, z, sizeof(unsigned int)); } -static const struct vec4 *get_readback_vec4(struct resource_readback *rb, unsigned int x, unsigned int y) -{ - return get_readback_data(rb, x, y, 0, sizeof(struct vec4)); -} - static void release_resource_readback(struct d3d12_resource_readback *rb) { D3D12_RANGE range = {0, 0}; @@ -565,36 +553,6 @@ static void check_readback_data_uint_(unsigned int line, struct resource_readbac ok_(line)(all_match, "Got 0x%08x, expected 0x%08x at (%u, %u, %u).\n", got, expected, x, y, z); } -#define check_readback_data_vec4(a, b, c, d) check_readback_data_vec4_(__LINE__, a, b, c, d) -static void check_readback_data_vec4_(unsigned int line, struct resource_readback *rb, - const RECT *rect, const struct vec4 *expected, unsigned int max_diff) -{ - RECT r = {0, 0, rb->width, rb->height}; - unsigned int x = 0, y = 0; - struct vec4 got = {0}; - bool all_match = true; - - if (rect) - r = *rect; - - for (y = r.top; y < r.bottom; ++y) - { - for (x = r.left; x < r.right; ++x) - { - got = *get_readback_vec4(rb, x, y); - if (!compare_vec4(&got, expected, max_diff)) - { - all_match = false; - break; - } - } - if (!all_match) - break; - } - ok_(line)(all_match, "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at (%u, %u).\n", - got.x, got.y, got.z, got.w, expected->x, expected->y, expected->z, expected->w, x, y); -} - #define check_sub_resource_uint(a, b, c, d, e, f) check_sub_resource_uint_(__LINE__, a, b, c, d, e, f) static inline void check_sub_resource_uint_(unsigned int line, ID3D12Resource *texture, unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index c8304ce6..a4e4f52b 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -577,36 +577,6 @@ static void release_readback(struct d3d11_shader_runner *runner, struct d3d11_re ID3D11Resource_Release(rb->resource); } -static const struct vec4 *get_readback_vec4(struct resource_readback *rb, unsigned int x, unsigned int y) -{ - return (struct vec4 *)((BYTE *)rb->data + y * rb->row_pitch) + x; -} - -static void check_readback_data_vec4(struct resource_readback *rb, - const RECT *rect, const struct vec4 *expected, unsigned int max_diff) -{ - unsigned int x = 0, y = 0; - struct vec4 got = {0}; - bool all_match = true; - - for (y = rect->top; y < rect->bottom; ++y) - { - for (x = rect->left; x < rect->right; ++x) - { - got = *get_readback_vec4(rb, x, y); - if (!compare_vec4(&got, expected, max_diff)) - { - all_match = false; - break; - } - } - if (!all_match) - break; - } - ok(all_match, "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at (%u, %u).\n", - got.x, got.y, got.z, got.w, expected->x, expected->y, expected->z, expected->w, x, y); -} - static void d3d11_runner_probe_vec4(struct shader_runner *r, const RECT *rect, const struct vec4 *v, unsigned int ulps) { struct d3d11_shader_runner *runner = d3d11_shader_runner(r); diff --git a/tests/shader_runner_d3d9.c b/tests/shader_runner_d3d9.c index 14f8184a..8fa189cc 100644 --- a/tests/shader_runner_d3d9.c +++ b/tests/shader_runner_d3d9.c @@ -480,36 +480,6 @@ static void init_readback(struct d3d9_shader_runner *runner, struct d3d9_resourc rb->rb.depth = 1; } -static const struct vec4 *get_readback_vec4(const struct resource_readback *rb, unsigned int x, unsigned int y) -{ - return (struct vec4 *)((BYTE *)rb->data + y * rb->row_pitch + x * sizeof(struct vec4)); -} - -static void check_readback_data_vec4(struct resource_readback *rb, - const RECT *rect, const struct vec4 *expected, unsigned int max_diff) -{ - unsigned int x = 0, y = 0; - struct vec4 got = {0}; - bool all_match = true; - - for (y = rect->top; y < rect->bottom; ++y) - { - for (x = rect->left; x < rect->right; ++x) - { - got = *get_readback_vec4(rb, x, y); - if (!compare_vec4(&got, expected, max_diff)) - { - all_match = false; - break; - } - } - if (!all_match) - break; - } - ok(all_match, "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at (%u, %u).\n", - got.x, got.y, got.z, got.w, expected->x, expected->y, expected->z, expected->w, x, y); -} - static void release_readback(struct d3d9_resource_readback *rb) { IDirect3DSurface9_UnlockRect(rb->surface); diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index 4ef371ac..f218399b 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -19,12 +19,12 @@ */ #define VK_NO_PROTOTYPES +#define VKD3D_TEST_NO_DEFS #include "config.h" #include "vulkan/vulkan.h" #include "vkd3d_shader.h" #include "vkd3d.h" #include "shader_runner.h" -#define VKD3D_TEST_NO_DEFS #include "vkd3d_test.h" struct vulkan_resource @@ -832,36 +832,6 @@ struct vulkan_resource_readback VkBuffer buffer; }; -static const struct vec4 *get_readback_vec4(const struct resource_readback *rb, unsigned int x, unsigned int y) -{ - return (struct vec4 *)((uint8_t *)rb->data + y * rb->row_pitch + x * sizeof(struct vec4)); -} - -static void check_readback_data_vec4(const struct resource_readback *rb, - const RECT *rect, const struct vec4 *expected, unsigned int max_diff) -{ - unsigned int x = 0, y = 0; - struct vec4 got = {0}; - bool all_match = true; - - for (y = rect->top; y < rect->bottom; ++y) - { - for (x = rect->left; x < rect->right; ++x) - { - got = *get_readback_vec4(rb, x, y); - if (!compare_vec4(&got, expected, max_diff)) - { - all_match = false; - break; - } - } - if (!all_match) - break; - } - ok(all_match, "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at (%u, %u).\n", - got.x, got.y, got.z, got.w, expected->x, expected->y, expected->z, expected->w, x, y); -} - static void vulkan_runner_probe_vec4(struct shader_runner *r, const RECT *rect, const struct vec4 *v, unsigned int ulps) { struct vulkan_shader_runner *runner = vulkan_shader_runner(r); diff --git a/tests/utils.h b/tests/utils.h index 2cb9511f..c7d6d772 100644 --- a/tests/utils.h +++ b/tests/utils.h @@ -23,6 +23,7 @@ #include <stdbool.h> #include <stdint.h> #include <stdlib.h> +#include "vkd3d_test.h" struct vec2 { @@ -112,4 +113,46 @@ static inline void set_rect(RECT *rect, int left, int top, int right, int bottom rect->bottom = bottom; } +static void *get_readback_data(const struct resource_readback *rb, + unsigned int x, unsigned int y, unsigned int z, size_t element_size) +{ + unsigned int slice_pitch = rb->row_pitch * rb->height; + return &((uint8_t *)rb->data)[slice_pitch * z + rb->row_pitch * y + x * element_size]; +} + +static const struct vec4 *get_readback_vec4(const struct resource_readback *rb, unsigned int x, unsigned int y) +{ + return get_readback_data(rb, x, y, 0, sizeof(struct vec4)); +} + +#define check_readback_data_vec4(a, b, c, d) check_readback_data_vec4_(__LINE__, a, b, c, d) +static inline void check_readback_data_vec4_(unsigned int line, const struct resource_readback *rb, + const RECT *rect, const struct vec4 *expected, unsigned int max_diff) +{ + RECT r = {0, 0, rb->width, rb->height}; + unsigned int x = 0, y = 0; + struct vec4 got = {0}; + bool all_match = true; + + if (rect) + r = *rect; + + for (y = r.top; y < r.bottom; ++y) + { + for (x = r.left; x < r.right; ++x) + { + got = *get_readback_vec4(rb, x, y); + if (!compare_vec4(&got, expected, max_diff)) + { + all_match = false; + break; + } + } + if (!all_match) + break; + } + ok_(line)(all_match, "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at (%u, %u).\n", + got.x, got.y, got.z, got.w, expected->x, expected->y, expected->z, expected->w, x, y); +} + #endif

1 0