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

Pedro Perdigão : user32/tests: Test an out-of-order RECT in RedrawWindow().
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: 06b3471605dc1e7d1466774b745435ecef845be4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06b3471605dc1e7d1466774b… Author: Pedro Perdigão <pperdigao(a)codeweavers.com> Date: Fri May 6 17:56:28 2022 +0100 user32/tests: Test an out-of-order RECT in RedrawWindow(). Signed-off-by: Pedro Perdigão <pperdigao(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c0a74d8edbe..84833e8b1be 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8174,8 +8174,9 @@ void dump_region(HRGN hrgn) HeapFree( GetProcessHeap(), 0, data ); } -#define check_update_rgn( hwnd, hrgn ) check_update_rgn_( __LINE__, hwnd, hrgn ) -static void check_update_rgn_( int line, HWND hwnd, HRGN hrgn ) +#define todo_check_update_rgn( hwnd, hrgn ) check_update_rgn_( __LINE__, TRUE, hwnd, hrgn ) +#define check_update_rgn( hwnd, hrgn ) check_update_rgn_( __LINE__, FALSE, hwnd, hrgn ) +static void check_update_rgn_( int line, BOOL todo, HWND hwnd, HRGN hrgn ) { INT ret; RECT r1, r2; @@ -8186,7 +8187,10 @@ static void check_update_rgn_( int line, HWND hwnd, HRGN hrgn ) ok( ret != ERROR, "GetUpdateRgn failed\n" ); if (ret == NULLREGION) { - ok_(__FILE__,line)( !hrgn, "Update region shouldn't be empty\n" ); + if(todo) + todo_wine ok_(__FILE__,line)( !hrgn, "Update region shouldn't be empty\n" ); + else + ok_(__FILE__,line)( !hrgn, "Update region shouldn't be empty\n" ); } else { @@ -8393,6 +8397,61 @@ static void test_paint_messages(void) ok(ret, "RedrawWindow returned %d instead of TRUE\n", ret); check_update_rgn( hwnd, 0 ); + /* test a zeroed rectangle */ + RedrawWindow( hwnd, NULL, 0, RDW_VALIDATE|RDW_NOFRAME|RDW_NOERASE ); + SetRect( &rect, 0, 0, 0, 0 ); + ret = RedrawWindow( hwnd, &rect, NULL, RDW_INVALIDATE ); + ok(ret, "RedrawWindow returned %d instead of TRUE\n", ret); + check_update_rgn( hwnd, 0 ); + + /* a well ordered rectangle */ + RedrawWindow( hwnd, NULL, 0, RDW_VALIDATE|RDW_NOFRAME|RDW_NOERASE ); + SetRect( &rect, 10, 5, 17, 21 ); + ret = RedrawWindow( hwnd, &rect, NULL, RDW_INVALIDATE ); + ok(ret, "RedrawWindow returned %d instead of TRUE\n", ret); + SetRectRgn( hrgn, 10, 5, 17, 21 ); + check_update_rgn( hwnd, hrgn ); + + /* empty rectangle, top and bottom are swapped but left and right have + the same value */ + RedrawWindow( hwnd, NULL, 0, RDW_VALIDATE|RDW_NOFRAME|RDW_NOERASE ); + SetRect( &rect, 5, 30, 5, 10 ); + ret = RedrawWindow( hwnd, &rect, NULL, RDW_INVALIDATE ); + ok(ret, "RedrawWindow returned %d instead of TRUE\n", ret); + check_update_rgn( hwnd, 0 ); + + /* empty rectangle, left and right are swapped but top and bottom have + the same value */ + RedrawWindow( hwnd, NULL, 0, RDW_VALIDATE|RDW_NOFRAME|RDW_NOERASE ); + SetRect( &rect, 17, 10, 5, 10 ); + ret = RedrawWindow( hwnd, &rect, NULL, RDW_INVALIDATE ); + ok(ret, "RedrawWindow returned %d instead of TRUE\n", ret); + check_update_rgn( hwnd, 0 ); + + /* Left and right are swapped */ + RedrawWindow( hwnd, NULL, 0, RDW_VALIDATE|RDW_NOFRAME|RDW_NOERASE ); + SetRect( &rect, 21, 12, 7, 30 ); + ret = RedrawWindow( hwnd, &rect, NULL, RDW_INVALIDATE ); + ok(ret, "RedrawWindow returned %d instead of TRUE\n", ret); + SetRectRgn( hrgn, 7, 12, 21, 30 ); + todo_check_update_rgn( hwnd, hrgn ); + + /* Top and bottom are swapped */ + RedrawWindow( hwnd, NULL, 0, RDW_VALIDATE|RDW_NOFRAME|RDW_NOERASE ); + SetRect( &rect, 7, 30, 21, 12 ); + ret = RedrawWindow( hwnd, &rect, NULL, RDW_INVALIDATE ); + ok(ret, "RedrawWindow returned %d instead of TRUE\n", ret); + SetRectRgn( hrgn, 7, 12, 21, 30 ); + todo_check_update_rgn( hwnd, hrgn ); + + /* both reference points are swapped */ + RedrawWindow( hwnd, NULL, 0, RDW_VALIDATE|RDW_NOFRAME|RDW_NOERASE ); + SetRect( &rect, 21, 30, 7, 12 ); + ret = RedrawWindow( hwnd, &rect, NULL, RDW_INVALIDATE ); + ok(ret, "RedrawWindow returned %d instead of TRUE\n", ret); + SetRectRgn( hrgn, 7, 12, 21, 30 ); + todo_check_update_rgn( hwnd, hrgn ); + /* flush pending messages */ flush_events(); flush_sequence();

1 0

Henri Verbeet : maintainers: Update the Direct2D section.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: d70c5c0f67a97d54ddc5ab75096c1a16db21f6b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d70c5c0f67a97d54ddc5ab75… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 12 19:13:29 2022 +0200 maintainers: Update the Direct2D section. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index c569409be90..b012f3c4e09 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -58,7 +58,8 @@ F: dlls/comdlg32/itemdlg.c F: dlls/comdlg32/tests/itemdlg.c Direct2D -M: Henri Verbeet <hverbeet(a)codeweavers.com> +M: Nikolay Sivov <nsivov(a)codeweavers.com> +P: Henri Verbeet <hverbeet(a)codeweavers.com> F: dlls/d2d*/ Direct3D

1 0

Jan Sikorski : wined3d: Reduce the size of staging BO's for texture uploads.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: 66d81ea34ec0670230a53a3f1a04962e7ee7abdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=66d81ea34ec0670230a53a3f… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Apr 29 13:18:56 2022 +0200 wined3d: Reduce the size of staging BO's for texture uploads. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 35688fcd0d9..595baf07788 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4876,6 +4876,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, struct wined3d_context_vk *context_vk = wined3d_context_vk(context); unsigned int dst_level, dst_row_pitch, dst_slice_pitch; struct wined3d_texture_sub_resource *sub_resource; + unsigned int src_width, src_height, src_depth; struct wined3d_bo_address staging_bo_addr; VkPipelineStageFlags bo_stage_flags = 0; const struct wined3d_vk_info *vk_info; @@ -4933,6 +4934,10 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, sub_resource = &dst_texture_vk->t.sub_resources[dst_sub_resource_idx]; vk_info = context_vk->vk_info; + src_width = src_box->right - src_box->left; + src_height = src_box->bottom - src_box->top; + src_depth = src_box->back - src_box->front; + src_offset = src_box->front * src_slice_pitch + (src_box->top / src_format->block_height) * src_row_pitch + (src_box->left / src_format->block_width) * src_format->block_byte_count; @@ -4945,10 +4950,15 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, /* We need to be outside of a render pass for vkCmdPipelineBarrier() and vkCmdCopyBufferToImage() calls below. */ wined3d_context_vk_end_current_render_pass(context_vk); - if (!src_bo_addr->buffer_object) { - if (!wined3d_context_vk_create_bo(context_vk, sub_resource->size, + unsigned int staging_row_pitch, staging_slice_pitch, staging_size; + + wined3d_format_calculate_pitch(src_format, context->device->surface_alignment, src_width, src_height, + &staging_row_pitch, &staging_slice_pitch); + staging_size = staging_slice_pitch * src_depth; + + if (!wined3d_context_vk_create_bo(context_vk, staging_size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo)) { ERR("Failed to create staging bo.\n"); @@ -4958,26 +4968,25 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, staging_bo_addr.buffer_object = &staging_bo.b; staging_bo_addr.addr = NULL; if (!(map_ptr = wined3d_context_map_bo_address(context, &staging_bo_addr, - sub_resource->size, WINED3D_MAP_DISCARD | WINED3D_MAP_WRITE))) + staging_size, WINED3D_MAP_DISCARD | WINED3D_MAP_WRITE))) { ERR("Failed to map staging bo.\n"); wined3d_context_vk_destroy_bo(context_vk, &staging_bo); return; } - wined3d_format_copy_data(src_format, src_bo_addr->addr + src_offset, src_row_pitch, - src_slice_pitch, map_ptr, dst_row_pitch, dst_slice_pitch, src_box->right - src_box->left, - src_box->bottom - src_box->top, src_box->back - src_box->front); + wined3d_format_copy_data(src_format, src_bo_addr->addr, src_row_pitch, src_slice_pitch, + map_ptr, staging_row_pitch, staging_slice_pitch, src_width, src_height, src_depth); range.offset = 0; - range.size = sub_resource->size; + range.size = staging_size; wined3d_context_unmap_bo_address(context, &staging_bo_addr, 1, &range); src_bo = &staging_bo; src_offset = 0; - src_row_pitch = dst_row_pitch; - src_slice_pitch = dst_slice_pitch; + src_row_pitch = staging_row_pitch; + src_slice_pitch = staging_slice_pitch; } else { @@ -5027,9 +5036,9 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, region.imageOffset.x = dst_x; region.imageOffset.y = dst_y; region.imageOffset.z = dst_z; - region.imageExtent.width = src_box->right - src_box->left; - region.imageExtent.height = src_box->bottom - src_box->top; - region.imageExtent.depth = src_box->back - src_box->front; + region.imageExtent.width = src_width; + region.imageExtent.height = src_height; + region.imageExtent.depth = src_depth; VK_CALL(vkCmdCopyBufferToImage(vk_command_buffer, src_bo->vk_buffer, dst_texture_vk->image.vk_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region));

1 0

Eric Pouech : winspool: Enable compilation with long types.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: 2a88b4203651ef329e99e2b841b1a0b68aa0427e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a88b4203651ef329e99e2b8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri May 13 10:48:08 2022 +0100 winspool: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/Makefile.in | 1 - dlls/winspool.drv/info.c | 372 +++++++++++++++++++++--------------------- dlls/winspool.drv/wspool.c | 2 +- 3 files changed, 187 insertions(+), 188 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2a88b4203651ef329e99…

1 0

Pedro Perdigão : win32u: Allow an out-of-order RECT in RedrawWindow().
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: 1146bde39e1de69667d4efdc0da94490ba8e87cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=1146bde39e1de69667d4efdc… Author: Pedro Perdigão <pperdigao(a)codeweavers.com> Date: Fri May 6 18:07:28 2022 +0100 win32u: Allow an out-of-order RECT in RedrawWindow(). Signed-off-by: Pedro Perdigão <pperdigao(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 16 ++++++---------- dlls/win32u/dce.c | 7 +++++-- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 84833e8b1be..2705914d5e5 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8174,9 +8174,8 @@ void dump_region(HRGN hrgn) HeapFree( GetProcessHeap(), 0, data ); } -#define todo_check_update_rgn( hwnd, hrgn ) check_update_rgn_( __LINE__, TRUE, hwnd, hrgn ) -#define check_update_rgn( hwnd, hrgn ) check_update_rgn_( __LINE__, FALSE, hwnd, hrgn ) -static void check_update_rgn_( int line, BOOL todo, HWND hwnd, HRGN hrgn ) +#define check_update_rgn( hwnd, hrgn ) check_update_rgn_( __LINE__, hwnd, hrgn ) +static void check_update_rgn_( int line, HWND hwnd, HRGN hrgn ) { INT ret; RECT r1, r2; @@ -8187,10 +8186,7 @@ static void check_update_rgn_( int line, BOOL todo, HWND hwnd, HRGN hrgn ) ok( ret != ERROR, "GetUpdateRgn failed\n" ); if (ret == NULLREGION) { - if(todo) - todo_wine ok_(__FILE__,line)( !hrgn, "Update region shouldn't be empty\n" ); - else - ok_(__FILE__,line)( !hrgn, "Update region shouldn't be empty\n" ); + ok_(__FILE__,line)( !hrgn, "Update region shouldn't be empty\n" ); } else { @@ -8434,7 +8430,7 @@ static void test_paint_messages(void) ret = RedrawWindow( hwnd, &rect, NULL, RDW_INVALIDATE ); ok(ret, "RedrawWindow returned %d instead of TRUE\n", ret); SetRectRgn( hrgn, 7, 12, 21, 30 ); - todo_check_update_rgn( hwnd, hrgn ); + check_update_rgn( hwnd, hrgn ); /* Top and bottom are swapped */ RedrawWindow( hwnd, NULL, 0, RDW_VALIDATE|RDW_NOFRAME|RDW_NOERASE ); @@ -8442,7 +8438,7 @@ static void test_paint_messages(void) ret = RedrawWindow( hwnd, &rect, NULL, RDW_INVALIDATE ); ok(ret, "RedrawWindow returned %d instead of TRUE\n", ret); SetRectRgn( hrgn, 7, 12, 21, 30 ); - todo_check_update_rgn( hwnd, hrgn ); + check_update_rgn( hwnd, hrgn ); /* both reference points are swapped */ RedrawWindow( hwnd, NULL, 0, RDW_VALIDATE|RDW_NOFRAME|RDW_NOERASE ); @@ -8450,7 +8446,7 @@ static void test_paint_messages(void) ret = RedrawWindow( hwnd, &rect, NULL, RDW_INVALIDATE ); ok(ret, "RedrawWindow returned %d instead of TRUE\n", ret); SetRectRgn( hrgn, 7, 12, 21, 30 ); - todo_check_update_rgn( hwnd, hrgn ); + check_update_rgn( hwnd, hrgn ); /* flush pending messages */ flush_events(); diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c index c41067af464..fbde3f3d0ec 100644 --- a/dlls/win32u/dce.c +++ b/dlls/win32u/dce.c @@ -1457,8 +1457,11 @@ BOOL WINAPI NtUserRedrawWindow( HWND hwnd, const RECT *rect, HRGN hrgn, UINT fla if (rect && !hrgn) { - if (IsRectEmpty( rect )) rect = ∅ - ret = redraw_window_rects( hwnd, flags, rect, 1 ); + RECT ordered = *rect; + + order_rect( &ordered ); + if (IsRectEmpty( &ordered )) ordered = empty; + ret = redraw_window_rects( hwnd, flags, &ordered, 1 ); } else if (!hrgn) {

1 0

Jan Sikorski : wined3d: Don't do a full cleanup when waiting for a command buffer.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: 3147de2569af8e6b17d35822140ffd01f6c8d8b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3147de2569af8e6b17d35822… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue May 3 17:03:28 2022 +0200 wined3d: Don't do a full cleanup when waiting for a command buffer. Only clean while the command buffer is running. A full cleanup is done after submitting to the queue. It can take a while, and we don't necessarily want to delay submitting. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 65 ++++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 40 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index b19220c2e34..aa3b45d54fd 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1067,11 +1067,30 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const wined3d_context_vk_destroy_vk_memory(context_vk, bo->vk_memory, bo->command_buffer_id); } -void wined3d_context_vk_poll_command_buffers(struct wined3d_context_vk *context_vk) +static void wined3d_context_vk_remove_command_buffer(struct wined3d_context_vk *context_vk, + unsigned int submit_index) { + struct wined3d_command_buffer_vk *buffer = &context_vk->submitted.buffers[submit_index]; struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; + + VK_CALL(vkDestroyFence(device_vk->vk_device, buffer->vk_fence, NULL)); + VK_CALL(vkFreeCommandBuffers(device_vk->vk_device, + context_vk->vk_command_pool, 1, &buffer->vk_command_buffer)); + + if (buffer->id > context_vk->completed_command_buffer_id) + context_vk->completed_command_buffer_id = buffer->id; + *buffer = context_vk->submitted.buffers[--context_vk->submitted.buffer_count]; +} + +static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *context_vk, VkFence vk_fence) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + struct wined3d_retired_objects_vk *retired = &context_vk->retired; + const struct wined3d_vk_info *vk_info = context_vk->vk_info; struct wined3d_command_buffer_vk *buffer; + struct wined3d_retired_object_vk *o; + uint64_t command_buffer_id; SIZE_T i = 0; while (i < context_vk->submitted.buffer_count) @@ -1085,26 +1104,11 @@ void wined3d_context_vk_poll_command_buffers(struct wined3d_context_vk *context_ TRACE("Command buffer %p with id 0x%s has finished.\n", buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); - VK_CALL(vkDestroyFence(device_vk->vk_device, buffer->vk_fence, NULL)); - VK_CALL(vkFreeCommandBuffers(device_vk->vk_device, - context_vk->vk_command_pool, 1, &buffer->vk_command_buffer)); - - if (buffer->id > context_vk->completed_command_buffer_id) - context_vk->completed_command_buffer_id = buffer->id; - *buffer = context_vk->submitted.buffers[--context_vk->submitted.buffer_count]; + if (buffer->vk_fence == vk_fence) + return; + wined3d_context_vk_remove_command_buffer(context_vk, i); } -} -static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *context_vk) -{ - struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); - struct wined3d_retired_objects_vk *retired = &context_vk->retired; - const struct wined3d_vk_info *vk_info = context_vk->vk_info; - struct wined3d_retired_object_vk *o; - uint64_t command_buffer_id; - SIZE_T i = 0; - - wined3d_context_vk_poll_command_buffers(context_vk); command_buffer_id = context_vk->completed_command_buffer_id; retired->free = NULL; @@ -1194,6 +1198,9 @@ static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *cont o->type = WINED3D_RETIRED_FREE_VK; o->u.next = retired->free; retired->free = o; + + if (vk_fence && VK_CALL(vkGetFenceStatus(device_vk->vk_device, vk_fence)) != VK_NOT_READY) + break; } } @@ -1649,7 +1656,7 @@ void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) VK_CALL(vkDestroyCommandPool(device_vk->vk_device, context_vk->vk_command_pool, NULL)); if (context_vk->vk_so_counter_bo.vk_buffer) wined3d_context_vk_destroy_bo(context_vk, &context_vk->vk_so_counter_bo); - wined3d_context_vk_cleanup_resources(context_vk); + wined3d_context_vk_cleanup_resources(context_vk, VK_NULL_HANDLE); wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_occlusion_query_pools); wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_timestamp_query_pools); wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_pipeline_statistics_query_pools); @@ -1820,13 +1827,14 @@ void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context buffer->id = 1; } context_vk->retired_bo_size = 0; - wined3d_context_vk_cleanup_resources(context_vk); + wined3d_context_vk_cleanup_resources(context_vk, VK_NULL_HANDLE); } void wined3d_context_vk_wait_command_buffer(struct wined3d_context_vk *context_vk, uint64_t id) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; + VkFence vk_fence; SIZE_T i; if (id <= context_vk->completed_command_buffer_id @@ -1838,10 +1846,17 @@ void wined3d_context_vk_wait_command_buffer(struct wined3d_context_vk *context_v if (context_vk->submitted.buffers[i].id != id) continue; - VK_CALL(vkWaitForFences(device_vk->vk_device, 1, - &context_vk->submitted.buffers[i].vk_fence, VK_TRUE, UINT64_MAX)); - wined3d_context_vk_cleanup_resources(context_vk); - return; + vk_fence = context_vk->submitted.buffers[i].vk_fence; + wined3d_context_vk_cleanup_resources(context_vk, vk_fence); + for (i = 0; i < context_vk->submitted.buffer_count; ++i) + { + if (context_vk->submitted.buffers[i].id != id) + continue; + + VK_CALL(vkWaitForFences(device_vk->vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX)); + wined3d_context_vk_remove_command_buffer(context_vk, i); + return; + } } ERR("Failed to find fence for command buffer with id 0x%s.\n", wine_dbgstr_longlong(id)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3a12f5ef261..385c84ffcbf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2685,7 +2685,6 @@ void wined3d_context_vk_image_barrier(struct wined3d_context_vk *context_vk, VkImageLayout new_layout, VkImage image, const VkImageSubresourceRange *range) DECLSPEC_HIDDEN; HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; -void wined3d_context_vk_poll_command_buffers(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context_vk, unsigned int wait_semaphore_count, const VkSemaphore *wait_semaphores, const VkPipelineStageFlags *wait_stages, unsigned int signal_semaphore_count, const VkSemaphore *signal_semaphores) DECLSPEC_HIDDEN;

1 0

Drew Ronneberg : ole32: Remove obsolete -D_OLE32_ from Makefile.in.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: 54099b8e95c50bb93085512ce1d599c1582b98d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54099b8e95c50bb93085512c… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Thu May 12 17:57:43 2022 -0400 ole32: Remove obsolete -D_OLE32_ from Makefile.in. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index 340ffdbded2..b87ec9fc975 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -2,7 +2,6 @@ MODULE = ole32.dll IMPORTLIB = ole32 IMPORTS = uuid advapi32 user32 gdi32 combase rpcrt4 kernelbase DELAYIMPORTS = oleaut32 -EXTRADEFS = -D_OLE32_ C_SRCS = \ antimoniker.c \

1 0

Conor McCarthy : vkd3d: Always destroy created objects on d3d12_fence_init() failure.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: vkd3d Branch: master Commit: a5c63dc4b977fc99366b2759bf6ae60c14ff5f5c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a5c63dc4b977fc99366b275… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri May 13 01:11:05 2022 +1000 vkd3d: Always destroy created objects on d3d12_fence_init() failure. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 55e6be58..b187c65b 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1247,6 +1247,7 @@ static struct d3d12_fence *unsafe_impl_from_ID3D12Fence(ID3D12Fence *iface) static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device *device, UINT64 initial_value, D3D12_FENCE_FLAGS flags) { + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; VkResult vr; HRESULT hr; int rc; @@ -1266,8 +1267,8 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * if ((rc = vkd3d_cond_init(&fence->null_event_cond))) { ERR("Failed to initialize cond variable, error %d.\n", rc); - vkd3d_mutex_destroy(&fence->mutex); - return hresult_from_errno(rc); + hr = hresult_from_errno(rc); + goto fail_destroy_mutex; } if (flags) @@ -1282,7 +1283,8 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * &fence->timeline_semaphore)) < 0) { WARN("Failed to create timeline semaphore, vr %d.\n", vr); - return hresult_from_vk_result(vr); + hr = hresult_from_vk_result(vr); + goto fail_destroy_null_cond; } fence->pending_timeline_value = initial_value; fence->gpu_wait_count = 0; @@ -1295,14 +1297,21 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * if (FAILED(hr = vkd3d_private_store_init(&fence->private_store))) { - vkd3d_mutex_destroy(&fence->mutex); - vkd3d_cond_destroy(&fence->null_event_cond); - return hr; + goto fail_destroy_timeline_semaphore; } d3d12_device_add_ref(fence->device = device); return S_OK; + +fail_destroy_timeline_semaphore: + VK_CALL(vkDestroySemaphore(device->vk_device, fence->timeline_semaphore, NULL)); +fail_destroy_null_cond: + vkd3d_cond_destroy(&fence->null_event_cond); +fail_destroy_mutex: + vkd3d_mutex_destroy(&fence->mutex); + + return hr; } HRESULT d3d12_fence_create(struct d3d12_device *device,

1 0

Francisco Casas : tests: Add additional subtests to implicit array initialization.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: vkd3d Branch: master Commit: 719e1bad1dee98393bbc0be9dd753b027fbb71fc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=719e1bad1dee98393bbc0be… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue May 10 15:08:29 2022 +0200 tests: Add additional subtests to implicit array initialization. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/hlsl-initializer-implicit-array.shader_test | 223 +++++++++++++++++++++- 1 file changed, 222 insertions(+), 1 deletion(-) diff --git a/tests/hlsl-initializer-implicit-array.shader_test b/tests/hlsl-initializer-implicit-array.shader_test index d2b94da4..648825eb 100644 --- a/tests/hlsl-initializer-implicit-array.shader_test +++ b/tests/hlsl-initializer-implicit-array.shader_test @@ -2,6 +2,7 @@ float4 main() : SV_TARGET { float4 arr[] = {10, 20, 30, 40, 50, 60, 70, 80}; + return arr[1]; } @@ -10,9 +11,229 @@ todo draw quad todo probe all rgba (50, 60, 70, 80) +[pixel shader] +float4 main() : sv_target +{ + float4 arr1[2] = {1, 2, 3, 4, 5, 6, 7, 8}; + float4 arr2[] = arr1; + + return arr2[1]; +} + +[test] +todo draw quad +todo probe all rgba (5.0, 6.0, 7.0, 8.0) + + +[pixel shader] +float4 main() : sv_target +{ + float2 arr[][3] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}; + + return float4(arr[1][0], arr[1][1]); +} + +[test] +todo draw quad +todo probe all rgba (7.0, 8.0, 9.0, 10.0) + + +[pixel shader] +struct foo +{ + float3 foo1; + float4 foo2; +}; + +struct bar +{ + struct foo aa; + int2 bb; + float4 cc[2]; +}; + +float4 main() : SV_TARGET +{ + struct bar p[] = { + 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, + 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, + }; + return p[0].aa.foo2 + p[1].cc[1]; +} + +[test] +todo draw quad +todo probe all rgba (318.0, 320.0, 322.0, 324.0) + + [pixel shader fail] +// Incompatible number of arguments in implicit size array initializer float4 main() : SV_TARGET { float4 arr[] = {10, 20, 30, 40, 50, 60, 70}; - return arr[0]; + + return 0.0; +} + + +[pixel shader fail] +// Incompatible number of arguments in implicit size array initializer +float4 main() : SV_TARGET +{ + float4 arr[] = {10, 20, 30, 40, 50, 60, 70, 80, 90}; + + return 0.0; +} + +[pixel shader fail] +// Implicit size inner array +float4 main() : sv_target +{ + float2 arr[3][] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}; + + return 0.0; +} + + +[pixel shader fail] +// Implicit size array without initializer +float4 main() : sv_target +{ + float4 arr[]; + + return 0.0; +} + + +[pixel shader fail] +// Implicit size array as struct member +struct foobar +{ + int a; + float4 arr[]; +}; + +float4 main() : sv_target +{ + struct foobar s; + + return 0.0; +} + + +[pixel shader fail] +// Implicit size array as function argument +float4 fun(float4 arr[]) +{ + return 1.0; +} +float4 main() : sv_target +{ + float4 arr[3] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}; + return fun(arr); +} + + +[pixel shader fail] +// Implicit size array as function return type +// Note: explicit size arrays are not allowed either. +float4[] fun() +{ + float4 ret[2] = {1, 2, 3, 4, 5, 6, 7, 8}; + + return ret; +} + +float4 main() : sv_target +{ fun(); + return 0.0; +} + + +[pixel shader fail] +// Implicit size array as a cast +float4 main() : sv_target +{ + float2 arr1[4] = {1, 2, 3, 4, 5, 6, 7, 8}; + float4 arr2[2] = (float4 []) arr1; + + return 0.0; +} + + +[pixel shader fail] +// Implicit size array as a typedef +typedef float4 arrtype[]; + +float4 main() : sv_target +{ + arrtype arr1 = {1, 2, 3, 4, 5, 6, 7, 8}; + + return 0.0; +} + + +[pixel shader fail] +// Implicit size array of elements of size 0 +struct emp +{ +}; + +float4 main() : sv_target +{ + struct emp arr[] = {1, 2, 3, 4}; + + return 0.0; +} + + +[pixel shader fail] +// Implicit size array of elements of size 0, without initializer +struct emp +{ +}; + +float4 main() : sv_target +{ + struct emp arr[]; + + return 0.0; +} + + +[pixel shader fail] +// Broadcast to an implicit size array +float4 main() : sv_target +{ + int a[4] = (int[]) 0; + + return 0.0; +} + + +[pixel shader fail] +// Implicit size array with an initializer of size 0 +struct emp +{ +}; + +float4 main() : sv_target +{ + float4 arr[] = (struct emp) 42; + + return 0.0; +} + + +[pixel shader fail] +// Implicit size array of elements of size 0 with initializer of size 0 +struct emp +{ +}; + +float4 main() : sv_target +{ + struct emp arr[] = (struct emp) 42; + + return 0.0; }

1 0

Francisco Casas : tests: Test textures in initializers.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: vkd3d Branch: master Commit: 1fc44e7be466c6e05f02639b1b49da5a4a23be65 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1fc44e7be466c6e05f02639… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue May 10 15:08:30 2022 +0200 tests: Test textures in initializers. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + tests/hlsl-initializer-objects.shader_test | 109 +++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) diff --git a/Makefile.am b/Makefile.am index 2742e77c..dd3ce1ff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -79,6 +79,7 @@ vkd3d_shader_tests = \ tests/hlsl-initializer-invalid-arg-count.shader_test \ tests/hlsl-initializer-implicit-array.shader_test \ tests/hlsl-initializer-local-array.shader_test \ + tests/hlsl-initializer-objects.shader_test \ tests/hlsl-initializer-nested.shader_test \ tests/hlsl-initializer-numeric.shader_test \ tests/hlsl-initializer-matrix.shader_test \ diff --git a/tests/hlsl-initializer-objects.shader_test b/tests/hlsl-initializer-objects.shader_test new file mode 100644 index 00000000..2306d07f --- /dev/null +++ b/tests/hlsl-initializer-objects.shader_test @@ -0,0 +1,109 @@ +[require] +shader model >= 4.0 + +[texture 0] +size (3, 3) +0.1 0.1 0.1 0.1 0.2 0.2 0.2 0.2 0.3 0.3 0.3 0.3 +0.4 0.4 0.4 0.4 0.5 0.5 0.5 0.5 0.6 0.6 0.6 0.6 +0.7 0.7 0.7 0.7 0.8 0.8 0.8 0.8 0.9 0.9 0.9 0.9 + +[texture 1] +size (2, 2) +0.1 0.1 0.1 0.0 0.2 0.2 0.2 0.0 +0.4 0.4 0.4 0.0 0.5 0.5 0.5 0.0 + + +[pixel shader] +Texture2D tex1; +Texture2D tex2; + +float4 main() : sv_target +{ + Texture2D q[2] = {tex1, tex2}; + + return q[0].Load(int3(0, 0, 0)) + q[1].Load(int3(0, 0, 0)); +} + +[test] +todo draw quad +todo probe all rgba (0.2, 0.2, 0.2, 0.1) + + +[pixel shader] +Texture2D tex; + +struct foo +{ + float2 aa; + Texture2D bb; + Texture2D cc; + float4 dd; +}; + +float4 main() : sv_target +{ + struct foo q = {10, 20, tex, tex, 30, 40, 50, 60}; + + return q.bb.Load(int3(2, 0, 0)) + q.cc.Load(int3(1, 2, 0)) + q.dd; +} + +[test] +todo draw quad +todo probe all rgba (31.1, 41.1, 51.1, 61.1) 1 + + +[pixel shader] +Texture2D tex1; +Texture2D tex2; + +struct foo +{ + float2 aa; + Texture2D bb[2]; // NOTE: this cannot be initialized in shader model >= 5.1 + float4 cc; +}; + +float4 main() : sv_target +{ + struct foo q = {10, 20, tex1, tex2, 30, 40, 50, 60}; + + return q.bb[0].Load(int3(0, 0, 0)) + q.bb[1].Load(int3(1, 1, 0)) + q.cc; +} + + +[pixel shader fail todo] +Texture2D tex; + +struct foo +{ + float2 aa; + Texture2D bb; + Texture2D cc; + float4 dd; +}; + +float4 main() : sv_target +{ + struct foo q = {10, 20, tex, 30, 40, 50, 60}; + + return 0.0; +} + + +[pixel shader fail todo] +Texture2D tex; + +struct foo +{ + float2 aa; + Texture2D bb; + Texture2D cc; + float4 dd; +}; + +float4 main() : sv_target +{ + struct foo q = {10, 20, tex, tex, tex, 30, 40, 50, 60}; + + return 0.0; +}

1 0