February 2022 - Wine-devel - list.winehq.org

[PATCH 1/2] wined3d: Reinitialize query pool's free list entry when it runs out.
by Jan Sikorski 11 Feb '22

11 Feb '22

We check if it's empty to put it back in. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 97c60719489..60132dc81b5 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1445,6 +1445,7 @@ bool wined3d_context_vk_allocate_query(struct wined3d_context_vk *context_vk, if (wined3d_query_pool_vk_allocate_query(pool_vk, &idx)) goto done; list_remove(&pool_vk->entry); + list_init(&pool_vk->entry); } if (!(pool_vk = heap_alloc_zero(sizeof(*pool_vk)))) -- 2.32.0

2 4

[PATCH 1/7] wined3d: Always set map_ptr for mapped OpenGL BOs.
by Zebediah Figura 11 Feb '22

11 Feb '22

Regardless of whether we are mapping persistently. Matches the Vulkan backend. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 7b40b1de0fb..9153b7fd95f 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2831,7 +2831,6 @@ static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, struct wined3d_context_ const struct wined3d_gl_info *gl_info; struct wined3d_bo_user *bo_user; struct wined3d_bo_gl tmp; - uint8_t *map_ptr; if (flags & WINED3D_MAP_NOOVERWRITE) goto map; @@ -2869,9 +2868,9 @@ map: { struct wined3d_allocator_chunk_gl *chunk_gl = wined3d_allocator_chunk_gl(bo->memory->chunk); - if (!(map_ptr = wined3d_allocator_chunk_gl_map(chunk_gl, context_gl))) + if (!(bo->b.map_ptr = wined3d_allocator_chunk_gl_map(chunk_gl, context_gl))) ERR("Failed to map chunk.\n"); - return map_ptr; + return bo->b.map_ptr; } gl_info = context_gl->gl_info; @@ -2906,31 +2905,32 @@ map: } gl_flags |= GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; - if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, gl_flags))) && wined3d_map_persistent()) - bo->b.map_ptr = map_ptr; + bo->b.map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, gl_flags)); } else if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { - map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, wined3d_resource_gl_map_flags(bo, flags))); + bo->b.map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, wined3d_resource_gl_map_flags(bo, flags))); } else { - map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))); + bo->b.map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))); } wined3d_context_gl_bind_bo(context_gl, bo->binding, 0); checkGLcall("Map buffer object"); - return map_ptr; + return bo->b.map_ptr; } static void wined3d_bo_gl_unmap(struct wined3d_bo_gl *bo, struct wined3d_context_gl *context_gl) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; - if (bo->b.map_ptr) + if (wined3d_map_persistent()) return; + bo->b.map_ptr = NULL; + wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); if (bo->memory) -- 2.34.1

3 10

[PATCH] wined3d: Use a separate heap for deferred resource upload buffers.
by Jan Sikorski 11 Feb '22

11 Feb '22

Significantly reduces global heap lock contention in some games. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/cs.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 90686e8d170..ffa0689e5a4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -49,6 +49,7 @@ struct wined3d_command_list SIZE_T data_size; void *data; + HANDLE upload_heap; SIZE_T resource_count; struct wined3d_resource **resources; @@ -3979,6 +3980,7 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) struct wined3d_deferred_context { struct wined3d_device_context c; + HANDLE upload_heap; SIZE_T data_size, data_capacity; void *data; @@ -4108,7 +4110,15 @@ static bool wined3d_deferred_context_map_upload_bo(struct wined3d_device_context deferred->upload_count + 1, sizeof(*deferred->uploads))) return false; - if (!(sysmem = heap_alloc(size + RESOURCE_ALIGNMENT - 1))) + if (!deferred->upload_heap) + deferred->upload_heap = HeapCreate(HEAP_NO_SERIALIZE, 0, 0); + if (!deferred->upload_heap) + { + ERR("Failed to create upload heap.\n"); + return false; + } + + if (!(sysmem = HeapAlloc(deferred->upload_heap, 0, size + RESOURCE_ALIGNMENT - 1))) return false; upload = &deferred->uploads[deferred->upload_count++]; @@ -4253,10 +4263,9 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte heap_free(deferred->resources); for (i = 0; i < deferred->upload_count; ++i) - { wined3d_resource_decref(deferred->uploads[i].resource); - heap_free(deferred->uploads[i].sysmem); - } + if (deferred->upload_heap) + HeapDestroy(deferred->upload_heap); heap_free(deferred->uploads); for (i = 0; i < deferred->command_list_count; ++i) @@ -4341,6 +4350,9 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->command_list_count = 0; deferred->query_count = 0; + object->upload_heap = deferred->upload_heap; + deferred->upload_heap = 0; + /* This is in fact recorded into a subsequent command list. */ if (restore) wined3d_device_context_set_state(&deferred->c, deferred->c.state); @@ -4357,13 +4369,11 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device static void wined3d_command_list_destroy_object(void *object) { struct wined3d_command_list *list = object; - SIZE_T i; TRACE("list %p.\n", list); - for (i = 0; i < list->upload_count; ++i) - heap_free(list->uploads[i].sysmem); - + if (list->upload_heap) + HeapDestroy(list->upload_heap); heap_free(list); } -- 2.32.0

2 1

[PATCH] wined3d: Use StretchBlt() in swapchain_blit_gdi().
by Paul Gofman 11 Feb '22

11 Feb '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Fixes Serious Sam: The Random Encounter which has the contents presented in a smaller rectangle in the upper left corner of the screen since commit 6181b0ea270dfe0be2a0246bb391568559cc01af. While at the same time the game benefits from that commit as it solves the issue which happens when display aspect ration doesn't match the game's one (in which case it should present letterboxed image which black parts get garbage without the commit). The actual issue is probably in the earlier commit 70418f69dd49da5625bb1893d9fc2bef3fe97b5e which doesn't account for possibly different source and destination rectangle dimensions. dlls/wined3d/swapchain.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 49a40f3e1d6..5fcbfc58779 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -459,8 +459,9 @@ static void swapchain_blit_gdi(struct wined3d_swapchain *swapchain, if (!(dst_dc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) ERR("Failed to get destination DC.\n"); - if (!BitBlt(dst_dc, dst_rect->left, dst_rect->top, dst_rect->right - dst_rect->left, - dst_rect->bottom - dst_rect->top, src_dc, src_rect->left, src_rect->top, SRCCOPY)) + if (!StretchBlt(dst_dc, dst_rect->left, dst_rect->top, dst_rect->right - dst_rect->left, + dst_rect->bottom - dst_rect->top, src_dc, src_rect->left, src_rect->top, + src_rect->right - src_rect->left, src_rect->bottom - src_rect->top, SRCCOPY)) ERR("Failed to blit.\n"); ReleaseDC(swapchain->win_handle, dst_dc); -- 2.34.1

2 1

[PATCH] d2d1: Implement d2d_bitmap_CopyFromBitmap().
by Jactry Zeng 11 Feb '22

11 Feb '22

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 28 ++++++++++++++++++++++++++-- dlls/d2d1/tests/d2d1.c | 39 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 50744836b13..971e3c7ff6b 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -133,9 +133,33 @@ static void STDMETHODCALLTYPE d2d_bitmap_GetDpi(ID2D1Bitmap1 *iface, float *dpi_ static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromBitmap(ID2D1Bitmap1 *iface, const D2D1_POINT_2U *dst_point, ID2D1Bitmap *bitmap, const D2D1_RECT_U *src_rect) { - FIXME("iface %p, dst_point %p, bitmap %p, src_rect %p stub!\n", iface, dst_point, bitmap, src_rect); + struct d2d_bitmap *src_bitmap = unsafe_impl_from_ID2D1Bitmap(bitmap); + struct d2d_bitmap *dst_bitmap = impl_from_ID2D1Bitmap1(iface); + ID3D11DeviceContext *context; + ID3D11Device *device; + D3D11_BOX box; - return E_NOTIMPL; + TRACE("iface %p, dst_point %p, bitmap %p, src_rect %p.\n", iface, dst_point, bitmap, src_rect); + + if (src_rect) + { + box.left = src_rect->left; + box.top = src_rect->top; + box.front = 0; + box.right = src_rect->right; + box.bottom = src_rect->bottom; + box.back = 1; + } + + ID3D11Resource_GetDevice(dst_bitmap->resource, &device); + ID3D11Device_GetImmediateContext(device, &context); + ID3D11DeviceContext_CopySubresourceRegion(context, dst_bitmap->resource, 0, + dst_point ? dst_point->x : 0, dst_point ? dst_point->y : 0, 0, + src_bitmap->resource, 0, src_rect ? &box : NULL); + ID3D11DeviceContext_Release(context); + ID3D11Device_Release(device); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromRenderTarget(ID2D1Bitmap1 *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index ba67dd53111..b3691d91173 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4802,10 +4802,11 @@ static void test_shared_bitmap(BOOL d3d11) static void test_bitmap_updates(BOOL d3d11) { D2D1_BITMAP_PROPERTIES bitmap_desc; + ID2D1Bitmap *bitmap, *dst_bitmap; + D2D1_RECT_U dst_rect, src_rect; struct d2d1_test_context ctx; + D2D1_POINT_2U dst_point; ID2D1RenderTarget *rt; - D2D1_RECT_U dst_rect; - ID2D1Bitmap *bitmap; D2D1_COLOR_F color; D2D1_RECT_F rect; D2D1_SIZE_U size; @@ -4883,6 +4884,40 @@ static void test_bitmap_updates(BOOL d3d11) match = compare_surface(&ctx, "cb8136c91fbbdc76bb83b8c09edc1907b0a5d0a6"); ok(match, "Surface does not match.\n"); + ID2D1RenderTarget_BeginDraw(rt); + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_Clear(rt, &color); + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, NULL, 0, &bitmap_desc, &dst_bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap_CopyFromBitmap(dst_bitmap, NULL, bitmap, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + dst_point.x = 1; dst_point.y = 1; + hr = ID2D1Bitmap_CopyFromBitmap(dst_bitmap, &dst_point, bitmap, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + dst_point.x = 0; dst_point.y = 1; + set_rect_u(&src_rect, 1, 1, 3, 3); + hr = ID2D1Bitmap_CopyFromBitmap(dst_bitmap, &dst_point, bitmap, &src_rect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + dst_point.x = 1; dst_point.y = 0; + set_rect_u(&src_rect, 2, 2, 1, 1); + hr = ID2D1Bitmap_CopyFromBitmap(dst_bitmap, &dst_point, bitmap, &src_rect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + set_rect_u(&src_rect, 1, 1, 2, 2); + hr = ID2D1Bitmap_CopyFromBitmap(dst_bitmap, NULL, bitmap, &src_rect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + set_rect(&rect, 320.0f, 0.0f, 640.0f, 240.0f); + ID2D1RenderTarget_DrawBitmap(rt, dst_bitmap, &rect, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + match = compare_surface(&ctx, "a1758bd644d897f75d43769ba26456af70cd9056"); + ok(match, "Surface does not match.\n"); + ID2D1Bitmap_Release(dst_bitmap); + ID2D1Bitmap_Release(bitmap); release_test_context(&ctx); } -- 2.34.1

2 1

[PATCH] mfplat/buffer: Lock D3D9 surfaces with usage flags.
by Giovanni Mascellani 11 Feb '22

11 Feb '22

This way the underlying implementation is able to save some copies. Running CHRONO TRIGGER with this commit saves 1-2 ms per frame in the sample copier on my computer. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfplat/buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index f161bb29d80..c45309e1c31 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -385,7 +385,7 @@ static HRESULT WINAPI d3d9_surface_buffer_Lock(IMFMediaBuffer *iface, BYTE **dat if (SUCCEEDED(hr)) { - hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &rect, NULL, 0); + hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &rect, NULL, D3DLOCK_READONLY); if (SUCCEEDED(hr)) { copy_image(buffer, buffer->_2d.linear_buffer, buffer->_2d.width, rect.pBits, rect.Pitch, @@ -425,7 +425,7 @@ static HRESULT WINAPI d3d9_surface_buffer_Unlock(IMFMediaBuffer *iface) { D3DLOCKED_RECT rect; - if (SUCCEEDED(hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &rect, NULL, 0))) + if (SUCCEEDED(hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &rect, NULL, D3DLOCK_DISCARD))) { copy_image(buffer, rect.pBits, rect.Pitch, buffer->_2d.linear_buffer, buffer->_2d.width, buffer->_2d.width, buffer->_2d.height); -- 2.34.1

1 0

[PATCH 7/7] msvcp60: Remove unused functions from ios.c file.
by Piotr Caban 11 Feb '22

11 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 1416 +++++++------------------------------------- 1 file changed, 225 insertions(+), 1191 deletions(-)

1 0

[PATCH 6/7] msvcp60: Add missing exports.
by Piotr Caban 11 Feb '22

11 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 9 +++++---- dlls/msvcp60/msvcp60.spec | 36 ++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 22 deletions(-)

1 0

[PATCH 5/7] msvcp60: Remove basic_ios<wchar> code.
by Piotr Caban 11 Feb '22

11 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 498 +++++++++++++++++--------------------- dlls/msvcp60/msvcp60.spec | 56 ++--- 2 files changed, 246 insertions(+), 308 deletions(-)

1 0

[PATCH 4/7] msvcp60: Remove basic_streambuf<wchar> code.
by Piotr Caban 11 Feb '22

11 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 164 ++------------------------------------------- 1 file changed, 6 insertions(+), 158 deletions(-)

1 0