September 2022 - Wine-Commits

Zebediah Figura : wined3d: Add a dirty region to the destination texture in wined3d_device_context_blt() if applicable.
by Alexandre Julliard Sept. 13, 2022

Sept. 13, 2022

Module: wine Branch: master Commit: 3178e9095b222aec312b6b718d7942ebc893d2b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/3178e9095b222aec312b6b718d7942… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 30 15:55:42 2022 -0500 wined3d: Add a dirty region to the destination texture in wined3d_device_context_blt() if applicable. --- dlls/d3d8/tests/visual.c | 2 +- dlls/wined3d/texture.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index b51760544c4..1f6e91609db 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5726,7 +5726,7 @@ static void add_dirty_rect_test(void) ok(hr == S_OK, "Failed to update texture, hr %#lx.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00ff00ff, 1), "Got unexpected color 0x%08x.\n", color); + ok(color_match(color, 0x00ff00ff, 1), "Got unexpected color 0x%08x.\n", color); /* Tests with managed textures. */ fill_surface(surface_managed0, 0x00ff0000, 0); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 09b26933353..88404c9f8a8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4171,6 +4171,9 @@ HRESULT CDECL wined3d_device_context_blt(struct wined3d_device_context *context, wined3d_device_context_emit_blt_sub_resource(&dst_texture->resource.device->cs->c, &dst_texture->resource, dst_sub_resource_idx, &dst_box, &src_texture->resource, src_sub_resource_idx, &src_box, flags, fx, filter); + if (dst_texture->dirty_regions) + wined3d_texture_add_dirty_region(dst_texture, dst_sub_resource_idx, &dst_box); + return WINED3D_OK; }

1 0

Zebediah Figura : wined3d: Remove a redundant variable.
by Alexandre Julliard Sept. 13, 2022

Sept. 13, 2022

Module: wine Branch: master Commit: 4f1198bf3b9ffcb69f9330f2eb1b17782a48aff6 URL: https://gitlab.winehq.org/wine/wine/-/commit/4f1198bf3b9ffcb69f9330f2eb1b17… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 29 17:03:37 2022 -0500 wined3d: Remove a redundant variable. --- dlls/wined3d/texture.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 15d87e02183..10a8dcb06f4 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1670,7 +1670,6 @@ void wined3d_texture_load(struct wined3d_texture *texture, || (texture->async.flags & WINED3D_TEXTURE_ASYNC_COLOR_KEY && !color_key_equal(&texture->async.gl_color_key, &texture->async.src_blt_color_key)))) { - unsigned int sub_count = texture->level_count * texture->layer_count; unsigned int i; TRACE("Reloading because of color key value change.\n");

1 0

Zebediah Figura : wined3d: Factor out wined3d_texture_validate_sub_resource_idx().
by Alexandre Julliard Sept. 13, 2022

Sept. 13, 2022

Module: wine Branch: master Commit: 44d6f2adbcca119faebc095f3cfbeeafc50d04f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/44d6f2adbcca119faebc095f3cfbee… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 29 17:16:18 2022 -0500 wined3d: Factor out wined3d_texture_validate_sub_resource_idx(). --- dlls/wined3d/device.c | 12 +++------ dlls/wined3d/texture.c | 61 +++++++++++++----------------------------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 24 insertions(+), 51 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f215da6d310..2cd558051d1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4905,17 +4905,11 @@ HRESULT CDECL wined3d_device_context_copy_sub_resource_region(struct wined3d_dev unsigned int src_level = src_sub_resource_idx % src_texture->level_count; unsigned int src_row_block_count, src_row_count; - if (dst_sub_resource_idx >= dst_texture->level_count * dst_texture->layer_count) - { - WARN("Invalid destination sub-resource %u.\n", dst_sub_resource_idx); + if (!wined3d_texture_validate_sub_resource_idx(dst_texture, dst_sub_resource_idx)) return WINED3DERR_INVALIDCALL; - } - if (src_sub_resource_idx >= src_texture->level_count * src_texture->layer_count) - { - WARN("Invalid source sub-resource %u.\n", src_sub_resource_idx); + if (!wined3d_texture_validate_sub_resource_idx(src_texture, src_sub_resource_idx)) return WINED3DERR_INVALIDCALL; - } if (dst_texture->sub_resources[dst_sub_resource_idx].map_count) { @@ -5369,7 +5363,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device TRACE("device %p, x_hotspot %u, y_hotspot %u, texture %p, sub_resource_idx %u.\n", device, x_hotspot, y_hotspot, texture, sub_resource_idx); - if (sub_resource_idx >= texture->level_count * texture->layer_count + if (!wined3d_texture_validate_sub_resource_idx(texture, sub_resource_idx) || texture->resource.type != WINED3D_RTYPE_TEXTURE_2D) return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 10a8dcb06f4..09b26933353 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -45,6 +45,15 @@ struct wined3d_rect_f float b; }; +bool wined3d_texture_validate_sub_resource_idx(const struct wined3d_texture *texture, unsigned int sub_resource_idx) +{ + if (sub_resource_idx < texture->level_count * texture->layer_count) + return true; + + WARN("Invalid sub-resource index %u.\n", sub_resource_idx); + return false; +} + BOOL wined3d_texture_can_use_pbo(const struct wined3d_texture *texture, const struct wined3d_d3d_info *d3d_info) { if (!d3d_info->pbo || texture->resource.format->conv_byte_count || texture->resource.pin_sysmem @@ -2212,16 +2221,10 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, static struct wined3d_texture_sub_resource *wined3d_texture_get_sub_resource(struct wined3d_texture *texture, unsigned int sub_resource_idx) { - UINT sub_count = texture->level_count * texture->layer_count; - TRACE("texture %p, sub_resource_idx %u.\n", texture, sub_resource_idx); - if (sub_resource_idx >= sub_count) - { - WARN("sub_resource_idx %u >= sub_count %u.\n", sub_resource_idx, sub_count); + if (!wined3d_texture_validate_sub_resource_idx(texture, sub_resource_idx)) return NULL; - } - return &texture->sub_resources[sub_resource_idx]; } @@ -4127,11 +4130,11 @@ HRESULT CDECL wined3d_device_context_blt(struct wined3d_device_context *context, context, dst_texture, dst_sub_resource_idx, wine_dbgstr_rect(dst_rect), src_texture, src_sub_resource_idx, wine_dbgstr_rect(src_rect), flags, fx, debug_d3dtexturefiltertype(filter)); - if (dst_sub_resource_idx >= dst_texture->level_count * dst_texture->layer_count + if (!wined3d_texture_validate_sub_resource_idx(dst_texture, dst_sub_resource_idx) || dst_texture->resource.type != WINED3D_RTYPE_TEXTURE_2D) return WINED3DERR_INVALIDCALL; - if (src_sub_resource_idx >= src_texture->level_count * src_texture->layer_count + if (!wined3d_texture_validate_sub_resource_idx(src_texture, src_sub_resource_idx) || src_texture->resource.type != WINED3D_RTYPE_TEXTURE_2D) return WINED3DERR_INVALIDCALL; @@ -4179,11 +4182,8 @@ HRESULT CDECL wined3d_texture_get_overlay_position(const struct wined3d_texture TRACE("texture %p, sub_resource_idx %u, x %p, y %p.\n", texture, sub_resource_idx, x, y); if (!(texture->resource.usage & WINED3DUSAGE_OVERLAY) - || sub_resource_idx >= texture->level_count * texture->layer_count) - { - WARN("Invalid sub-resource specified.\n"); + || !wined3d_texture_validate_sub_resource_idx(texture, sub_resource_idx)) return WINEDDERR_NOTAOVERLAYSURFACE; - } overlay = &texture->overlay_info[sub_resource_idx]; if (!overlay->dst_texture) @@ -4211,11 +4211,8 @@ HRESULT CDECL wined3d_texture_set_overlay_position(struct wined3d_texture *textu TRACE("texture %p, sub_resource_idx %u, x %d, y %d.\n", texture, sub_resource_idx, x, y); if (!(texture->resource.usage & WINED3DUSAGE_OVERLAY) - || sub_resource_idx >= texture->level_count * texture->layer_count) - { - WARN("Invalid sub-resource specified.\n"); + || !wined3d_texture_validate_sub_resource_idx(texture, sub_resource_idx)) return WINEDDERR_NOTAOVERLAYSURFACE; - } overlay = &texture->overlay_info[sub_resource_idx]; w = overlay->dst_rect.right - overlay->dst_rect.left; @@ -4238,18 +4235,12 @@ HRESULT CDECL wined3d_texture_update_overlay(struct wined3d_texture *texture, un dst_sub_resource_idx, wine_dbgstr_rect(dst_rect), flags); if (!(texture->resource.usage & WINED3DUSAGE_OVERLAY) || texture->resource.type != WINED3D_RTYPE_TEXTURE_2D - || sub_resource_idx >= texture->level_count * texture->layer_count) - { - WARN("Invalid sub-resource specified.\n"); + || !wined3d_texture_validate_sub_resource_idx(texture, sub_resource_idx)) return WINEDDERR_NOTAOVERLAYSURFACE; - } if (!dst_texture || dst_texture->resource.type != WINED3D_RTYPE_TEXTURE_2D - || dst_sub_resource_idx >= dst_texture->level_count * dst_texture->layer_count) - { - WARN("Invalid destination sub-resource specified.\n"); + || wined3d_texture_validate_sub_resource_idx(dst_texture, dst_sub_resource_idx)) return WINED3DERR_INVALIDCALL; - } overlay = &texture->overlay_info[sub_resource_idx]; @@ -4298,15 +4289,10 @@ HRESULT CDECL wined3d_texture_update_overlay(struct wined3d_texture *texture, un void * CDECL wined3d_texture_get_sub_resource_parent(struct wined3d_texture *texture, unsigned int sub_resource_idx) { - unsigned int sub_count = texture->level_count * texture->layer_count; - TRACE("texture %p, sub_resource_idx %u.\n", texture, sub_resource_idx); - if (sub_resource_idx >= sub_count) - { - WARN("sub_resource_idx %u >= sub_count %u.\n", sub_resource_idx, sub_count); + if (!wined3d_texture_validate_sub_resource_idx(texture, sub_resource_idx)) return NULL; - } return texture->sub_resources[sub_resource_idx].parent; } @@ -4314,15 +4300,10 @@ void * CDECL wined3d_texture_get_sub_resource_parent(struct wined3d_texture *tex void CDECL wined3d_texture_set_sub_resource_parent(struct wined3d_texture *texture, unsigned int sub_resource_idx, void *parent) { - unsigned int sub_count = texture->level_count * texture->layer_count; - TRACE("texture %p, sub_resource_idx %u, parent %p.\n", texture, sub_resource_idx, parent); - if (sub_resource_idx >= sub_count) - { - WARN("sub_resource_idx %u >= sub_count %u.\n", sub_resource_idx, sub_count); + if (!wined3d_texture_validate_sub_resource_idx(texture, sub_resource_idx)) return; - } texture->sub_resources[sub_resource_idx].parent = parent; } @@ -4330,17 +4311,13 @@ void CDECL wined3d_texture_set_sub_resource_parent(struct wined3d_texture *textu HRESULT CDECL wined3d_texture_get_sub_resource_desc(const struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_sub_resource_desc *desc) { - unsigned int sub_count = texture->level_count * texture->layer_count; const struct wined3d_resource *resource; unsigned int level_idx; TRACE("texture %p, sub_resource_idx %u, desc %p.\n", texture, sub_resource_idx, desc); - if (sub_resource_idx >= sub_count) - { - WARN("sub_resource_idx %u >= sub_count %u.\n", sub_resource_idx, sub_count); + if (!wined3d_texture_validate_sub_resource_idx(texture, sub_resource_idx)) return WINED3DERR_INVALIDCALL; - } resource = &texture->resource; desc->format = resource->format->id; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1dbd90067f5..a87471fd5d1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4690,6 +4690,8 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un unsigned int src_sub_resource_idx, const struct wined3d_box *src_box) DECLSPEC_HIDDEN; void wined3d_texture_validate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; +bool wined3d_texture_validate_sub_resource_idx(const struct wined3d_texture *texture, + unsigned int sub_resource_idx) DECLSPEC_HIDDEN; void wined3d_texture_clear_dirty_regions(struct wined3d_texture *texture) DECLSPEC_HIDDEN; HRESULT wined3d_texture_no3d_init(struct wined3d_texture *texture_no3d, struct wined3d_device *device,

1 0

Zebediah Figura : wined3d: Mark managed textures as dirty if applicable in wined3d_device_evict_managed_resources().
by Alexandre Julliard Sept. 13, 2022

Sept. 13, 2022

Module: wine Branch: master Commit: 25127c563714b999ba1fa32debdc18259500d964 URL: https://gitlab.winehq.org/wine/wine/-/commit/25127c563714b999ba1fa32debdc18… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 29 19:01:18 2022 -0500 wined3d: Mark managed textures as dirty if applicable in wined3d_device_evict_managed_resources(). --- dlls/wined3d/device.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2cd558051d1..e214c47f071 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5521,8 +5521,23 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) if ((resource->usage & WINED3DUSAGE_MANAGED) && !resource->map_count) { - TRACE("Evicting %p.\n", resource); - wined3d_cs_emit_unload_resource(device->cs, resource); + if (resource->access & WINED3D_RESOURCE_ACCESS_GPU) + { + TRACE("Evicting %p.\n", resource); + wined3d_cs_emit_unload_resource(device->cs, resource); + } + + if (resource->type != WINED3D_RTYPE_BUFFER) + { + struct wined3d_texture *texture = texture_from_resource(resource); + unsigned int i; + + if (texture->dirty_regions) + { + for (i = 0; i < texture->layer_count; ++i) + wined3d_texture_add_dirty_region(texture, i, NULL); + } + } } } }

1 0

Alexandre Julliard : vcomp/tests: Limit the number of nested threads.
by Alexandre Julliard Sept. 13, 2022

Sept. 13, 2022

Module: wine Branch: master Commit: 6222a7a000f4cb49656bc27f0f46889c13e4cba5 URL: https://gitlab.winehq.org/wine/wine/-/commit/6222a7a000f4cb49656bc27f0f4688… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 13 18:20:57 2022 +0200 vcomp/tests: Limit the number of nested threads. Without a limit we'd create nb_cpus ^ 2 threads. --- dlls/vcomp/tests/vcomp.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 639291a1772..67000e9f343 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -406,6 +406,10 @@ static void CDECL num_threads_cb(BOOL nested, int parallel, int nested_threads, is_parallel = pomp_in_parallel(); ok(is_parallel == parallel, "expected %d, got %d\n", parallel, is_parallel); + /* limit number of nested threads */ + nested_threads = min( nested_threads, 256 / pomp_get_max_threads() ); + p_vcomp_set_num_threads(nested_threads); + thread_count = 0; p_vcomp_fork(TRUE, 2, num_threads_cb2, TRUE, &thread_count); if (nested) @@ -422,17 +426,6 @@ static void CDECL num_threads_cb(BOOL nested, int parallel, int nested_threads, is_parallel = pomp_in_parallel(); ok(is_parallel == parallel, "expected %d, got %d\n", parallel, is_parallel); - - p_vcomp_set_num_threads(4); - thread_count = 0; - p_vcomp_fork(TRUE, 2, num_threads_cb2, TRUE, &thread_count); - if (nested) - ok(thread_count == 4, "expected 4 threads, got %ld\n", thread_count); - else - ok(thread_count == 1, "expected 1 thread, got %ld\n", thread_count); - - is_parallel = pomp_in_parallel(); - ok(is_parallel == parallel, "expected %d, got %d\n", parallel, is_parallel); } static void test_omp_get_num_threads(BOOL nested)

1 0

Alexandre Julliard : gdi32/tests: Mark some tests that fail without Vulkan as todo.
by Alexandre Julliard Sept. 13, 2022

Sept. 13, 2022

Module: wine Branch: master Commit: 3e3caf1efd1c96f0c044d51f30701f6848f43659 URL: https://gitlab.winehq.org/wine/wine/-/commit/3e3caf1efd1c96f0c044d51f30701f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 13 16:34:01 2022 +0200 gdi32/tests: Mark some tests that fail without Vulkan as todo. --- dlls/gdi32/tests/driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 79eedda1241..3a300b4dff5 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -937,6 +937,7 @@ static void test_D3DKMTQueryVideoMemoryInfo(void) query_memory_info.PhysicalAdapterIndex = 0; query_memory_info.MemorySegmentGroup = groups[i]; status = pD3DKMTQueryVideoMemoryInfo(&query_memory_info); + todo_wine_if (status == STATUS_INVALID_PARAMETER) /* fails on Wine without a Vulkan adapter */ ok(status == STATUS_SUCCESS, "Got unexpected return code %#lx.\n", status); ok(query_memory_info.Budget >= query_memory_info.AvailableForReservation, "Unexpected budget %I64u and reservation %I64u.\n", query_memory_info.Budget, @@ -952,6 +953,7 @@ static void test_D3DKMTQueryVideoMemoryInfo(void) /* Query using the current process handle */ query_memory_info.hProcess = GetCurrentProcess(); status = pD3DKMTQueryVideoMemoryInfo(&query_memory_info); + todo_wine_if (status == STATUS_INVALID_PARAMETER) /* fails on Wine without a Vulkan adapter */ ok(status == STATUS_SUCCESS, "Got unexpected return code %#lx.\n", status); /* Query using a process handle without PROCESS_QUERY_INFORMATION privilege */

1 0

Alexandre Julliard : winetest: Don't require an email if we have a URL.
by Alexandre Julliard Sept. 13, 2022

Sept. 13, 2022

Module: wine Branch: master Commit: 12bf088ac0b47b1cc5deb3096856c930b99f8ff4 URL: https://gitlab.winehq.org/wine/wine/-/commit/12bf088ac0b47b1cc5deb3096856c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 13 13:01:38 2022 +0200 winetest: Don't require an email if we have a URL. --- programs/winetest/main.c | 6 +++++- tools/gitlab/test.yml | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 59965526e02..e7b365d2091 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -507,7 +507,8 @@ static void print_version (void) xprintf(", %s", is_elevated ? "elevated" : "not elevated"); xprintf ("\n"); } - xprintf (" Submitter=%s\n", email ); + if (email) + xprintf (" Submitter=%s\n", email ); if (description) xprintf (" Description=%s\n", description ); if (url) @@ -1502,8 +1503,11 @@ int __cdecl main( int argc, char *argv[] ) while (!email) { if (!interactive) + { + if (url) break; report (R_FATAL, "Please specify an email address (-m option) to enable developers\n" " to contact you about your report if necessary."); + } if (guiAskEmail () == IDABORT) exit (1); } diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index c500a6602d4..a7edd17f447 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -49,7 +49,7 @@ debian-32: needs: - job: build-daily-linux script: - - wine usr/local/lib/wine/i386-windows/winetest.exe -q -t gitlab-$CI_JOB_NAME -m $CI_JOB_URL + - wine usr/local/lib/wine/i386-windows/winetest.exe -q -t gitlab-$CI_JOB_NAME -u $CI_JOB_URL debian-64: extends: .wine-test @@ -58,4 +58,4 @@ debian-64: needs: - job: build-daily-linux script: - - wine usr/local/lib/wine/x86_64-windows/winetest.exe -q -t gitlab-$CI_JOB_NAME -m $CI_JOB_URL + - wine usr/local/lib/wine/x86_64-windows/winetest.exe -q -t gitlab-$CI_JOB_NAME -u $CI_JOB_URL

1 0

Rémi Bernon : widl: Allow parameterized types in runtimeclass interfaces.
by Alexandre Julliard Sept. 13, 2022

Sept. 13, 2022

Module: wine Branch: master Commit: de95ee6c662e99c7d37737609aa5874c6016aadc URL: https://gitlab.winehq.org/wine/wine/-/commit/de95ee6c662e99c7d37737609aa587… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 8 19:35:46 2022 +0200 widl: Allow parameterized types in runtimeclass interfaces. --- tools/widl/parser.y | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 4000f37032c..c483eb06ff0 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1086,6 +1086,7 @@ interfacedef: attributes interface { if ($2->type_type == TYPE_PARAMETERIZED_TY interfaceref: tINTERFACE typename { $$ = get_type(TYPE_INTERFACE, $2, current_namespace, 0); } | tINTERFACE namespace_pfx typename { $$ = get_type(TYPE_INTERFACE, $3, $2, 0); } + | tINTERFACE parameterized_type { if (type_get_type(($$ = $2)) != TYPE_INTERFACE) error_loc("%s is not an interface\n", $$->name); } ; dispinterfaceref:

1 0

Zebediah Figura : wined3d: Do not create larger staging buffers than necessary in adapter_vk_copy_bo_address().
by Alexandre Julliard Sept. 13, 2022

Sept. 13, 2022

Module: wine Branch: master Commit: 35be2e76a66aa64c27f39880b3409c5d11248535 URL: https://gitlab.winehq.org/wine/wine/-/commit/35be2e76a66aa64c27f39880b3409c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 1 11:15:06 2022 -0500 wined3d: Do not create larger staging buffers than necessary in adapter_vk_copy_bo_address(). This greatly increases performance in "Discovery Tour by Assassin's Creed: Ancient Egypt". The application frequently performs small (< 1 kiB) uploads to a large (128 MiB) buffer. Without this patch, we will always create and destroy a new Vulkan memory allocation, and the Vulkan driver will waste time zeroing the entire allocation. --- dlls/wined3d/adapter_vk.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 58671cfb5f9..bf93e4a1c19 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1165,9 +1165,12 @@ void adapter_vk_copy_bo_address(struct wined3d_context *context, return; } + for (i = 0; i < range_count; ++i) + size = max(size, ranges[i].offset + ranges[i].size); + if (src_bo && !(src_bo->memory_type & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT)) { - if (!(wined3d_context_vk_create_bo(context_vk, src_bo->size, VK_BUFFER_USAGE_TRANSFER_DST_BIT, + if (!(wined3d_context_vk_create_bo(context_vk, size, VK_BUFFER_USAGE_TRANSFER_DST_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo))) { ERR("Failed to create staging bo.\n"); @@ -1187,7 +1190,7 @@ void adapter_vk_copy_bo_address(struct wined3d_context *context, if (dst_bo && (!(dst_bo->memory_type & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) || (!(map_flags & WINED3D_MAP_DISCARD) && dst_bo->command_buffer_id > context_vk->completed_command_buffer_id))) { - if (!(wined3d_context_vk_create_bo(context_vk, dst_bo->size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, + if (!(wined3d_context_vk_create_bo(context_vk, size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo))) { ERR("Failed to create staging bo.\n"); @@ -1204,9 +1207,6 @@ void adapter_vk_copy_bo_address(struct wined3d_context *context, return; } - for (i = 0; i < range_count; ++i) - size = max(size, ranges[i].offset + ranges[i].size); - src_ptr = adapter_vk_map_bo_address(context, src, size, WINED3D_MAP_READ); dst_ptr = adapter_vk_map_bo_address(context, dst, size, map_flags);

1 0

Hans Leidekker : ncrypt: Use BCrypt algorithm pseudo-handles.
by Alexandre Julliard Sept. 13, 2022

Sept. 13, 2022

Module: wine Branch: master Commit: 4918be2c5905c849cc992e0968858365401c4a8e URL: https://gitlab.winehq.org/wine/wine/-/commit/4918be2c5905c849cc992e09688583… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 12 16:00:39 2022 +0200 ncrypt: Use BCrypt algorithm pseudo-handles. --- dlls/ncrypt/main.c | 32 +++++--------------------------- dlls/ncrypt/ncrypt_internal.h | 1 - 2 files changed, 5 insertions(+), 28 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 9f859acfdf9..89fbfcb795a 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -130,38 +130,21 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n static struct object *create_key_object(enum algid algid, NCRYPT_PROV_HANDLE provider) { struct object *object; - NTSTATUS status; - - if (!(object = allocate_object(KEY))) - { - ERR("Error allocating memory\n"); - return NULL; - } switch (algid) { case RSA: - { - status = BCryptOpenAlgorithmProvider(&object->key.bcrypt_alg, BCRYPT_RSA_ALGORITHM, NULL, 0); - if (status != STATUS_SUCCESS) - { - ERR("Error opening algorithm provider %#lx\n", status); - free(object); - return NULL; - } + if (!(object = allocate_object(KEY))) return NULL; object->key.algid = RSA; set_object_property(object, NCRYPT_ALGORITHM_GROUP_PROPERTY, (BYTE *)BCRYPT_RSA_ALGORITHM, sizeof(BCRYPT_RSA_ALGORITHM)); break; - } + default: - { ERR("Invalid algid %#x\n", algid); - free(object); return NULL; } - } set_object_property(object, NCRYPT_PROVIDER_HANDLE_PROPERTY, (BYTE *)&provider, sizeof(provider)); return object; @@ -190,11 +173,10 @@ SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCR return NTE_NO_MEMORY; } - status = BCryptGenerateKeyPair(object->key.bcrypt_alg, &object->key.bcrypt_key, default_bitlen, 0); + status = BCryptGenerateKeyPair(BCRYPT_RSA_ALG_HANDLE, &object->key.bcrypt_key, default_bitlen, 0); if (status != STATUS_SUCCESS) { ERR("Error generating key pair %#lx\n", status); - BCryptCloseAlgorithmProvider(object->key.bcrypt_alg, 0); free(object); return map_ntstatus(status); } @@ -304,10 +286,7 @@ SECURITY_STATUS WINAPI NCryptFreeBuffer(PVOID buf) static SECURITY_STATUS free_key_object(struct key *key) { - NTSTATUS status, status2; - status = BCryptDestroyKey(key->bcrypt_key); - if ((status2 = BCryptCloseAlgorithmProvider(key->bcrypt_alg, 0))) return map_ntstatus(status2); - return status ? map_ntstatus(status) : ERROR_SUCCESS; + return map_ntstatus( BCryptDestroyKey(key->bcrypt_key) ); } SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE handle) @@ -414,11 +393,10 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H return NTE_NO_MEMORY; } - status = BCryptImportKeyPair(object->key.bcrypt_alg, NULL, type, &object->key.bcrypt_key, data, datasize, 0); + status = BCryptImportKeyPair(BCRYPT_RSA_ALG_HANDLE, NULL, type, &object->key.bcrypt_key, data, datasize, 0); if (status != STATUS_SUCCESS) { WARN("Error importing key pair %#lx\n", status); - BCryptCloseAlgorithmProvider(object->key.bcrypt_alg, 0); free(object); return map_ntstatus(status); } diff --git a/dlls/ncrypt/ncrypt_internal.h b/dlls/ncrypt/ncrypt_internal.h index 0ab20de14ad..effb75df45f 100644 --- a/dlls/ncrypt/ncrypt_internal.h +++ b/dlls/ncrypt/ncrypt_internal.h @@ -31,7 +31,6 @@ enum algid struct key { enum algid algid; - BCRYPT_ALG_HANDLE bcrypt_alg; BCRYPT_KEY_HANDLE bcrypt_key; };

1 0