Module: wine Branch: master Commit: df7e680cd2ee52a8fabf9d59f9f0a6ad428249a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/df7e680cd2ee52a8fabf9d59f9f0a6a...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Mon May 22 23:10:51 2023 +0200
d2d1: Create GDI-compatible swapchain only for corresponding target usage.
---
dlls/d2d1/hwnd_render_target.c | 4 +++- dlls/d2d1/tests/d2d1.c | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c index a62f31b909d..f176a25e956 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -889,7 +889,9 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target swapchain_desc.Windowed = TRUE; swapchain_desc.SwapEffect = hwnd_rt_desc->presentOptions & D2D1_PRESENT_OPTIONS_RETAIN_CONTENTS ? DXGI_SWAP_EFFECT_SEQUENTIAL : DXGI_SWAP_EFFECT_DISCARD; - swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE; + swapchain_desc.Flags = 0; + if (desc->usage & D2D1_RENDER_TARGET_USAGE_GDI_COMPATIBLE) + swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE;
hr = IDXGIFactory_CreateSwapChain(dxgi_factory, (IUnknown *)d3d_device, &swapchain_desc, &render_target->swapchain); IDXGIFactory_Release(dxgi_factory); diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index b00d3fc7444..3d8f82237a6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -13732,10 +13732,7 @@ static void test_hwnd_target_is_supported(BOOL d3d11) desc = template_desc; desc.pixelFormat = pixel_formats[i]; hr = ID2D1Factory_CreateHwndRenderTarget(ctx.factory, &desc, &hwnd_rt_desc, &rt); - todo_wine_if(i == 3 || i == 4 || i == 5) ok(hr == S_OK, "%u: unexpected hr %#lx.\n", i, hr); - if (FAILED(hr)) - continue;
/* Resolve to default format. */ if (desc.pixelFormat.format == DXGI_FORMAT_UNKNOWN)