January 2024 - Wine-Commits

Jacek Caban : winevdm: Use char type for max length assignment.
by Alexandre Julliard Jan. 25, 2024

Jan. 25, 2024

Module: wine Branch: master Commit: df0726e3591b068815d030141e59199ec3fafa66 URL: https://gitlab.winehq.org/wine/wine/-/commit/df0726e3591b068815d030141e5919… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 9 12:00:47 2023 +0100 winevdm: Use char type for max length assignment. --- programs/winevdm/winevdm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 5b5f72db253..87c25f0d191 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -359,7 +359,7 @@ static char *build_command_line( char **argv ) return NULL; p = cmd_line; - *p++ = (len < 256) ? len : 255; + *p++ = (len < 256) ? len : '\xff'; for (arg = argv; *arg; arg++) { BOOL has_space,has_quote;

1 0

Alexandre Julliard : ntdll: Share the nested exception handler across platforms.
by Alexandre Julliard Jan. 25, 2024

Jan. 25, 2024

Module: wine Branch: master Commit: 014f020e3487e3ab729559dc712df962576e1ba8 URL: https://gitlab.winehq.org/wine/wine/-/commit/014f020e3487e3ab729559dc712df9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 25 16:17:52 2024 +0100 ntdll: Share the nested exception handler across platforms. --- dlls/ntdll/exception.c | 11 +++++++++++ dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/signal_arm.c | 19 +++++-------------- dlls/ntdll/signal_arm64.c | 19 +++++-------------- dlls/ntdll/signal_x86_64.c | 11 +---------- 5 files changed, 24 insertions(+), 38 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 69f061768bd..f5ff845b1ee 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -230,6 +230,17 @@ NTSTATUS WINAPI dispatch_user_callback( void *args, ULONG len, ULONG id ) #endif +/******************************************************************* + * nested_exception_handler + */ +EXCEPTION_DISPOSITION WINAPI nested_exception_handler( EXCEPTION_RECORD *rec, void *frame, + CONTEXT *context, void *dispatch ) +{ + if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) return ExceptionContinueSearch; + return ExceptionNestedException; +} + + /******************************************************************* * raise_status * diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 299363d7363..756b19ae649 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -52,6 +52,8 @@ extern LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ); extern NTSTATUS WINAPI dispatch_user_callback( void *args, ULONG len, ULONG id ); extern EXCEPTION_DISPOSITION WINAPI user_callback_handler( EXCEPTION_RECORD *record, void *frame, CONTEXT *context, void *dispatch ); +extern EXCEPTION_DISPOSITION WINAPI nested_exception_handler( EXCEPTION_RECORD *rec, void *frame, + CONTEXT *context, void *dispatch ); extern void DECLSPEC_NORETURN raise_status( NTSTATUS status, EXCEPTION_RECORD *rec ); extern LONG WINAPI call_unhandled_exception_filter( PEXCEPTION_POINTERS eptr ); extern void WINAPI process_breakpoint(void); diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 17a2b8caa08..eb55b883e51 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -304,28 +304,17 @@ static DWORD call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT } -static DWORD __cdecl nested_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, - CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) -{ - if (!(rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) - rec->ExceptionFlags |= EH_NESTED_CALL; - - return ExceptionContinueSearch; -} - - /********************************************************************** * call_handler * * Call a single exception handler. - * FIXME: Handle nested exceptions. */ static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_CONTEXT *dispatch ) { EXCEPTION_REGISTRATION_RECORD frame; DWORD res; - frame.Handler = nested_exception_handler; + frame.Handler = (PEXCEPTION_HANDLER)nested_exception_handler; __wine_push_frame( &frame ); TRACE( "calling handler %p (rec=%p, frame=0x%lx context=%p, dispatch=%p)\n", @@ -404,7 +393,8 @@ static NTSTATUS call_function_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_con case ExceptionContinueSearch: break; case ExceptionNestedException: - FIXME( "nested exception\n" ); + rec->ExceptionFlags |= EH_NESTED_CALL; + TRACE_(seh)( "nested exception\n" ); break; case ExceptionCollidedUnwind: { ULONG_PTR frame; @@ -434,7 +424,8 @@ static NTSTATUS call_function_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_con case ExceptionContinueSearch: break; case ExceptionNestedException: - FIXME( "nested exception\n" ); + rec->ExceptionFlags |= EH_NESTED_CALL; + TRACE_(seh)( "nested exception\n" ); break; case ExceptionCollidedUnwind: { ULONG_PTR frame; diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 2cf7e5fd855..54a1612bd90 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -335,28 +335,17 @@ static DWORD call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT } -static DWORD __cdecl nested_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, - CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) -{ - if (!(rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) - rec->ExceptionFlags |= EH_NESTED_CALL; - - return ExceptionContinueSearch; -} - - /********************************************************************** * call_handler * * Call a single exception handler. - * FIXME: Handle nested exceptions. */ static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_CONTEXT *dispatch ) { EXCEPTION_REGISTRATION_RECORD frame; DWORD res; - frame.Handler = nested_exception_handler; + frame.Handler = (PEXCEPTION_HANDLER)nested_exception_handler; __wine_push_frame( &frame ); TRACE( "calling handler %p (rec=%p, frame=%I64x context=%p, dispatch=%p)\n", @@ -435,7 +424,8 @@ static NTSTATUS call_function_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_con case ExceptionContinueSearch: break; case ExceptionNestedException: - FIXME( "nested exception\n" ); + rec->ExceptionFlags |= EH_NESTED_CALL; + TRACE_(seh)( "nested exception\n" ); break; case ExceptionCollidedUnwind: { ULONG64 frame; @@ -465,7 +455,8 @@ static NTSTATUS call_function_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_con case ExceptionContinueSearch: break; case ExceptionNestedException: - FIXME( "nested exception\n" ); + rec->ExceptionFlags |= EH_NESTED_CALL; + TRACE_(seh)( "nested exception\n" ); break; case ExceptionCollidedUnwind: { ULONG64 frame; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 1344b89a9ca..db2976b1a28 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -357,15 +357,6 @@ __ASM_GLOBAL_FUNC( RtlCaptureContext, "fxsave 0x100(%rcx)\n\t" /* context->FltSave */ "ret" ); -DWORD __cdecl nested_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, - CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) -{ - if (!(rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) - return ExceptionNestedException; - - return ExceptionContinueSearch; -} - /*********************************************************************** * exception_handler_call_wrapper */ @@ -391,7 +382,7 @@ static DWORD exception_handler_call_wrapper( EXCEPTION_RECORD *rec, void *frame, EXCEPTION_REGISTRATION_RECORD wrapper_frame; DWORD res; - wrapper_frame.Handler = nested_exception_handler; + wrapper_frame.Handler = (PEXCEPTION_HANDLER)nested_exception_handler; __wine_push_frame( &wrapper_frame ); res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, context, dispatch ); __wine_pop_frame( &wrapper_frame );

1 0

Rémi Bernon : user32/tests: Cleanup the mouse input WM_NCHITTEST / SetCapture tests.
by Alexandre Julliard Jan. 25, 2024

Jan. 25, 2024

Module: wine Branch: master Commit: 07d522426afeda2e6a7d25830dbbebd83c535062 URL: https://gitlab.winehq.org/wine/wine/-/commit/07d522426afeda2e6a7d25830dbbeb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 20 18:49:56 2024 +0100 user32/tests: Cleanup the mouse input WM_NCHITTEST / SetCapture tests. And run them in the dedicated desktop. --- dlls/user32/tests/input.c | 695 +++++++++++++++++++++++++++------------------- 1 file changed, 409 insertions(+), 286 deletions(-)

1 0

Rémi Bernon : user32/tests: Run the mouse hook tests in the separate desktop.
by Alexandre Julliard Jan. 25, 2024

Jan. 25, 2024

Module: wine Branch: master Commit: 6ba584d1e0d3ee31dbb8f9545a0f5745aa5dc0e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/6ba584d1e0d3ee31dbb8f9545a0f57… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 24 10:40:06 2024 +0100 user32/tests: Run the mouse hook tests in the separate desktop. And run SetCursorPos / ClipCursor tests in a separate function, they don't need hooks or windows. --- dlls/user32/tests/input.c | 425 ++++++++++++++++++++++++---------------------- 1 file changed, 223 insertions(+), 202 deletions(-)

1 0

Rémi Bernon : user32/tests: Add an optional hwnd to input messages tests.
by Alexandre Julliard Jan. 25, 2024

Jan. 25, 2024

Module: wine Branch: master Commit: 2b3b900490f0870aa68d1ec109ab21417046bb1e URL: https://gitlab.winehq.org/wine/wine/-/commit/2b3b900490f0870aa68d1ec109ab21… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 20 17:10:07 2024 +0100 user32/tests: Add an optional hwnd to input messages tests. And rename keyboard tests to avoid conflicts with mouse tests. --- dlls/user32/tests/input.c | 212 +++++++++++++++++++++++----------------------- 1 file changed, 108 insertions(+), 104 deletions(-)

1 0

Giovanni Mascellani : tests: Mark a strip cut test as buggy in MoltenVK.
by Alexandre Julliard Jan. 25, 2024

Jan. 25, 2024

Module: vkd3d Branch: master Commit: fd7d23f64bc8c33fe3b59431219e14c0865be37a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fd7d23f64bc8c33fe3b59431219e1… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jan 5 16:12:40 2024 +0100 tests: Mark a strip cut test as buggy in MoltenVK. Metal, and therefore MoltenVK, doesn't support disabling primitive restart. --- tests/d3d12.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 46d8bad7..9a853296 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -33741,11 +33741,14 @@ static void test_primitive_restart(void) unsigned int last_index; bool full_quad; bool is_todo; + bool is_mvk_bug; } tests[] = { {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R16_UINT, indices16, sizeof(indices16), 0x0003, true}, - {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R16_UINT, indices16_max, sizeof(indices16_max), 0xffff, true}, + /* Metal, and therefore MoltenVK, doesn't support disabling + * primitive restart. */ + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R16_UINT, indices16_max, sizeof(indices16_max), 0xffff, true, false, true}, {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R32_UINT, indices, sizeof(indices), 0x0003, true}, {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R32_UINT, indices_max16, sizeof(indices_max16), 0xffff, true}, @@ -33821,6 +33824,7 @@ static void test_primitive_restart(void) get_resource_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); if (tests[i].full_quad) { + bug_if(is_mvk_device(context.device) && tests[i].is_mvk_bug) todo_if(tests[i].is_todo) check_readback_data_uint(&rb.rb, NULL, 0xff00ff00, 0); }

1 0

Giovanni Mascellani : tests: Mark geometry shaders as buggy on MoltenVK.
by Alexandre Julliard Jan. 25, 2024

Jan. 25, 2024

Module: vkd3d Branch: master Commit: 74a14dad28ee2366aa6edad821743e476da6666b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/74a14dad28ee2366aa6edad821743… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Jan 4 20:21:56 2024 +0100 tests: Mark geometry shaders as buggy on MoltenVK. --- tests/d3d12.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 39e7013d..4c218d83 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -27923,6 +27923,7 @@ static void test_geometry_shader(void) color = get_readback_uint(&rb.rb, 255, 240, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); color = get_readback_uint(&rb.rb, 320, 240, 0); + bug_if(is_mvk_device(device)) ok(compare_color(color, 0xffffff00, 1), "Got unexpected color 0x%08x.\n", color); color = get_readback_uint(&rb.rb, 385, 240, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); @@ -27937,6 +27938,7 @@ static void test_geometry_shader(void) color = get_readback_uint(&rb.rb, 255, 240, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); color = get_readback_uint(&rb.rb, 320, 240, 0); + bug_if(is_mvk_device(device)) ok(compare_color(color, 0xffffff00, 1), "Got unexpected color 0x%08x.\n", color); color = get_readback_uint(&rb.rb, 385, 240, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); @@ -28142,12 +28144,15 @@ static void test_layered_rendering(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + bug_if(is_mvk_device(device)) check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); reset_command_list(command_list, context.allocator); check_sub_resource_uint(context.render_target, 1, queue, command_list, 0xffffffff, 0); reset_command_list(command_list, context.allocator); + bug_if(is_mvk_device(device)) check_sub_resource_uint(context.render_target, 2, queue, command_list, 0x00000000, 0); reset_command_list(command_list, context.allocator); + bug_if(is_mvk_device(device)) check_sub_resource_uint(context.render_target, 3, queue, command_list, 0xffffff00, 0); ID3D12Resource_Release(vb);

1 0

Giovanni Mascellani : tests: Mark the tessellation pipeline as buggy on MoltenVK.
by Alexandre Julliard Jan. 25, 2024

Jan. 25, 2024

Module: vkd3d Branch: master Commit: b6c1e6dcdfbb2d852e685f8797cd330d3a4c56b9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b6c1e6dcdfbb2d852e685f8797cd3… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Jan 4 21:17:46 2024 +0100 tests: Mark the tessellation pipeline as buggy on MoltenVK. --- tests/d3d12.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 4c218d83..06e67f9c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29752,6 +29752,7 @@ static void test_hull_shader_fork_phase(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + bug_if(is_mvk_device(context.device)) check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff000000, 0); destroy_test_context(&context); @@ -30409,7 +30410,7 @@ static void test_tessellation_primitive_id(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - bug_if(is_nvidia_device(context.device)) + bug_if(is_nvidia_device(context.device) || is_mvk_device(context.device)) check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); ID3D12Resource_Release(vb);

1 0

Giovanni Mascellani : tests: Mark a depth sampling test as buggy on MoltenVK.
by Alexandre Julliard Jan. 25, 2024

Jan. 25, 2024

Module: vkd3d Branch: master Commit: c5469c85e83b8ab782fed140cb1e519388b0600e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c5469c85e83b8ab782fed140cb1e5… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jan 5 13:46:57 2024 +0100 tests: Mark a depth sampling test as buggy on MoltenVK. MoltenVK seems to be unable to handle tight inequalities (i.e., 0.5 <= 0.5) properly on 16 bit depth resources. --- tests/d3d12.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 06e67f9c..46d8bad7 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20549,12 +20549,12 @@ static void test_depth_clip(void) destroy_test_context(&context); } -#define check_depth_stencil_sampling(a, b, c, d, e, f, g) \ - check_depth_stencil_sampling_(__LINE__, a, b, c, d, e, f, g) +#define check_depth_stencil_sampling(a, b, c, d, e, f, g, h) \ + check_depth_stencil_sampling_(__LINE__, a, b, c, d, e, f, g, h) static void check_depth_stencil_sampling_(unsigned int line, struct test_context *context, ID3D12PipelineState *pso, ID3D12Resource *cb, ID3D12Resource *texture, D3D12_CPU_DESCRIPTOR_HANDLE dsv_handle, ID3D12DescriptorHeap *srv_heap, - float expected_value) + float expected_value, bool is_bug) { static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; ID3D12GraphicsCommandList *command_list; @@ -20585,6 +20585,7 @@ static void check_depth_stencil_sampling_(unsigned int line, struct test_context transition_sub_resource_state(command_list, context->render_target, 0, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + bug_if(is_bug) check_sub_resource_float_(line, context->render_target, 0, queue, command_list, expected_value, 2); reset_command_list(command_list, context->allocator); @@ -20738,6 +20739,7 @@ static void test_depth_stencil_sampling(void) DXGI_FORMAT dsv_format; DXGI_FORMAT depth_view_format; DXGI_FORMAT stencil_view_format; + bool is_mvk_bug; } tests[] = { @@ -20747,8 +20749,10 @@ static void test_depth_stencil_sampling(void) DXGI_FORMAT_R32_FLOAT}, {DXGI_FORMAT_R24G8_TYPELESS, DXGI_FORMAT_D24_UNORM_S8_UINT, DXGI_FORMAT_R24_UNORM_X8_TYPELESS, DXGI_FORMAT_X24_TYPELESS_G8_UINT}, + /* For 16 bit depth MoltenVK doesn't handle properly the case + * when the comparison is tight (i.e., 0.5 <= 0.5). */ {DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_D16_UNORM, - DXGI_FORMAT_R16_UNORM}, + DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_UNKNOWN, true}, }; memset(&desc, 0, sizeof(desc)); @@ -20851,39 +20855,40 @@ static void test_depth_stencil_sampling(void) /* pso_compare */ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle, D3D12_CLEAR_FLAG_DEPTH, 1.0f, 0, 0, NULL); - check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 0.0f); + check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 0.0f, false); reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle, D3D12_CLEAR_FLAG_DEPTH, 0.0f, 0, 0, NULL); - check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 1.0f); + check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 1.0f, false); reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle, D3D12_CLEAR_FLAG_DEPTH, 0.5f, 0, 0, NULL); - check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 0.0f); + check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 0.0f, + tests[i].is_mvk_bug && is_mvk_device(device)); reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle, D3D12_CLEAR_FLAG_DEPTH, 0.6f, 0, 0, NULL); - check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 0.0f); + check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 0.0f, false); ps_constant.x = 0.7f; update_buffer_data(cb, 0, sizeof(ps_constant), &ps_constant); reset_command_list(command_list, context.allocator); - check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 1.0f); + check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 1.0f, false); /* pso_depth */ reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle, D3D12_CLEAR_FLAG_DEPTH, 1.0f, 0, 0, NULL); - check_depth_stencil_sampling(&context, pso_depth, cb, texture, dsv_handle, srv_heap, 1.0f); + check_depth_stencil_sampling(&context, pso_depth, cb, texture, dsv_handle, srv_heap, 1.0f, false); reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle, D3D12_CLEAR_FLAG_DEPTH, 0.2f, 0, 0, NULL); - check_depth_stencil_sampling(&context, pso_depth, cb, texture, dsv_handle, srv_heap, 0.2f); + check_depth_stencil_sampling(&context, pso_depth, cb, texture, dsv_handle, srv_heap, 0.2f, false); if (!tests[i].stencil_view_format) { @@ -20907,33 +20912,33 @@ static void test_depth_stencil_sampling(void) reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle, D3D12_CLEAR_FLAG_STENCIL, 0.0f, 0, 0, NULL); - check_depth_stencil_sampling(&context, pso_stencil, cb, texture, dsv_handle, srv_heap, 0.0f); + check_depth_stencil_sampling(&context, pso_stencil, cb, texture, dsv_handle, srv_heap, 0.0f, false); reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle, D3D12_CLEAR_FLAG_STENCIL, 0.0f, 100, 0, NULL); - check_depth_stencil_sampling(&context, pso_stencil, cb, texture, dsv_handle, srv_heap, 100.0f); + check_depth_stencil_sampling(&context, pso_stencil, cb, texture, dsv_handle, srv_heap, 100.0f, false); reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle, D3D12_CLEAR_FLAG_STENCIL, 0.0f, 255, 0, NULL); - check_depth_stencil_sampling(&context, pso_stencil, cb, texture, dsv_handle, srv_heap, 255.0f); + check_depth_stencil_sampling(&context, pso_stencil, cb, texture, dsv_handle, srv_heap, 255.0f, false); /* pso_depth_stencil */ reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle, D3D12_CLEAR_FLAG_DEPTH | D3D12_CLEAR_FLAG_STENCIL, 0.3f, 3, 0, NULL); - check_depth_stencil_sampling(&context, pso_depth_stencil, cb, texture, dsv_handle, srv_heap, 3.3f); + check_depth_stencil_sampling(&context, pso_depth_stencil, cb, texture, dsv_handle, srv_heap, 3.3f, false); reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle, D3D12_CLEAR_FLAG_DEPTH | D3D12_CLEAR_FLAG_STENCIL, 1.0f, 3, 0, NULL); - check_depth_stencil_sampling(&context, pso_depth_stencil, cb, texture, dsv_handle, srv_heap, 4.0f); + check_depth_stencil_sampling(&context, pso_depth_stencil, cb, texture, dsv_handle, srv_heap, 4.0f, false); reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle, D3D12_CLEAR_FLAG_DEPTH | D3D12_CLEAR_FLAG_STENCIL, 0.0f, 0, 0, NULL); - check_depth_stencil_sampling(&context, pso_depth_stencil, cb, texture, dsv_handle, srv_heap, 0.0f); + check_depth_stencil_sampling(&context, pso_depth_stencil, cb, texture, dsv_handle, srv_heap, 0.0f, false); destroy_depth_stencil(&ds);

1 0

Giovanni Mascellani : tests: Mark ReadFromSubresource() and WriteToSubresource() as todo on MoltenVK.
by Alexandre Julliard Jan. 25, 2024

Jan. 25, 2024

Module: vkd3d Branch: master Commit: 586ebeafecd41dbeaf529f47e5d88287ddea544e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/586ebeafecd41dbeaf529f47e5d88… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat Oct 28 04:07:06 2023 +0200 tests: Mark ReadFromSubresource() and WriteToSubresource() as todo on MoltenVK. --- tests/d3d12.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index c75e112f..39e7013d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -34035,11 +34035,11 @@ static void test_read_write_subresource(void) /* NULL box */ hr = ID3D12Resource_WriteToSubresource(src_texture, 0, NULL, dst_buffer, row_pitch, slice_pitch); - todo_if(is_nvidia_device(device)) + todo_if(is_nvidia_device(device) || is_mvk_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, NULL); - todo_if(is_nvidia_device(device)) + todo_if(is_nvidia_device(device) || is_mvk_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Empty box */ @@ -34078,20 +34078,20 @@ static void test_read_write_subresource(void) if (i) { hr = ID3D12Resource_WriteToSubresource(src_texture, 0, NULL, zero_buffer, row_pitch, slice_pitch); - todo_if(is_nvidia_device(device)) + todo_if(is_nvidia_device(device) || is_mvk_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Write region 1 */ set_box(&box, 0, 0, 0, 2, 2, 2); hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, dst_buffer, row_pitch, slice_pitch); - todo_if(is_nvidia_device(device)) + todo_if(is_nvidia_device(device) || is_mvk_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Write region 2 */ set_box(&box, 2, 2, 2, 11, 13, 17); hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, &dst_buffer[2 * 128 * 100 + 2 * 128 + 2], row_pitch, slice_pitch); - todo_if(is_nvidia_device(device)) + todo_if(is_nvidia_device(device) || is_mvk_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); } else @@ -34113,14 +34113,14 @@ static void test_read_write_subresource(void) /* Read region 1 */ set_box(&box, 0, 0, 0, 2, 2, 2); hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box); - todo_if(is_nvidia_device(device)) + todo_if(is_nvidia_device(device) || is_mvk_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Read region 2 */ set_box(&box, 2, 2, 2, 11, 13, 17); hr = ID3D12Resource_ReadFromSubresource(src_texture, &dst_buffer[2 * 128 * 100 + 2 * 128 + 2], row_pitch, slice_pitch, 0, &box); - todo_if(is_nvidia_device(device)) + todo_if(is_nvidia_device(device) || is_mvk_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); for (z = 0; z < 64; ++z) @@ -34146,7 +34146,7 @@ static void test_read_write_subresource(void) if (got != expected) break; } - todo_if(is_nvidia_device(device)) + todo_if(is_nvidia_device(device) || is_mvk_device(device)) ok(got == expected, "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n", got, x, y, z, expected); vkd3d_test_pop_context(); } @@ -34196,7 +34196,7 @@ static void test_read_write_subresource(void) if (got != expected) break; } - todo_if(is_nvidia_device(device)) + todo_if(is_nvidia_device(device) || is_mvk_device(device)) ok(got == expected, "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n", got, x, y, z, expected); release_resource_readback(&rb);

1 0