April 2023 - Wine-commits - list.winehq.org

Stefan Dösinger : d3d9/tests: Accept AMD GPU sysmem sample failure in test_mipmap_upload.
by Alexandre Julliard 25 Apr '23

25 Apr '23

Module: wine Branch: master Commit: 830906f3dcc7acfa8892af9b8c97955f06a31df4 URL: https://gitlab.winehq.org/wine/wine/-/commit/830906f3dcc7acfa8892af9b8c9795… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 24 16:41:39 2023 +0300 d3d9/tests: Accept AMD GPU sysmem sample failure in test_mipmap_upload. --- dlls/d3d9/tests/visual.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f82bb1e921c..23e22c2340f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -285,15 +285,18 @@ static D3DCOLOR check_expected_rt_color(unsigned int line, IDirect3DSurface9 *rt return color; } -#define check_rt_color(a, b) check_rt_color_(__LINE__, a, b, false) -#define check_rt_color_todo(a, b) check_rt_color_(__LINE__, a, b, true) -#define check_rt_color_todo_if(a, b, c) check_rt_color_(__LINE__, a, b, c) -static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR expected_color, bool todo) +#define check_rt_color(a, b) check_rt_color_(__LINE__, a, b, false, 0, false) +#define check_rt_color_broken(a, b, c, d) check_rt_color_(__LINE__, a, b, false, c, d) +#define check_rt_color_todo(a, b) check_rt_color_(__LINE__, a, b, true, 0, false) +#define check_rt_color_todo_if(a, b, c) check_rt_color_(__LINE__, a, b, c, 0, false) +static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR expected_color, bool todo, + D3DCOLOR broken_color, bool is_broken) { unsigned int color = check_expected_rt_color(line, rt, expected_color); todo_wine_if (todo) - ok_(__FILE__, line)(color == expected_color, "Got unexpected color 0x%08x.\n", color); + ok_(__FILE__, line)(color == expected_color || broken(is_broken && color == broken_color), + "Got unexpected color 0x%08x.\n", color); } static IDirect3DDevice9 *create_device(IDirect3D9 *d3d, HWND device_window, HWND focus_window, BOOL windowed) @@ -28012,7 +28015,8 @@ static void test_mipmap_upload(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); draw_textured_quad(&context, texture); - check_rt_color(context.backbuffer, 0x00111111 * (j + 1)); + /* AMD Windows drivers don't sample from sysmem textures. */ + check_rt_color_broken(context.backbuffer, 0x00111111 * (j + 1), 0x00000000, pools[i] == D3DPOOL_SYSTEMMEM); winetest_pop_context(); }

1 0

Stefan Dösinger : d3d8/tests: Radeon GPUs don't draw from sysmem textures.
by Alexandre Julliard 25 Apr '23

25 Apr '23

Module: wine Branch: master Commit: e39c497559df18c31a422e37b4e6c76949bd3ce1 URL: https://gitlab.winehq.org/wine/wine/-/commit/e39c497559df18c31a422e37b4e6c7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 7 12:43:50 2022 +0300 d3d8/tests: Radeon GPUs don't draw from sysmem textures. --- dlls/d3d8/tests/visual.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 5c2b71fc8c5..75afff65a9c 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5828,7 +5828,9 @@ static void add_dirty_rect_test(void) ok(hr == S_OK, "Failed to set texture, hr %#lx.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + /* Radeon GPUs read zero from sysmem textures. */ + ok(color_match(color, 0x000000ff, 1) || broken(color_match(color, 0x00000000, 1)), + "Got unexpected color 0x%08x.\n", color); /* Blitting to the sysmem texture adds a dirty rect. */ fill_surface(surface_src_red, 0x00000000, D3DLOCK_NO_DIRTY_UPDATE);

1 0

Stefan Dösinger : d3d8/test: Accept AMD GPU sysmem sample failure in test_mipmap_upload.
by Alexandre Julliard 25 Apr '23

25 Apr '23

Module: wine Branch: master Commit: 60adbec765c9007f5a0e43f10e50108f2c6da350 URL: https://gitlab.winehq.org/wine/wine/-/commit/60adbec765c9007f5a0e43f10e5010… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 24 16:49:14 2023 +0300 d3d8/test: Accept AMD GPU sysmem sample failure in test_mipmap_upload. --- dlls/d3d8/tests/visual.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 75afff65a9c..264a4230a75 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -248,10 +248,12 @@ static void check_rect(struct surface_readback *rb, RECT r, const char *message) } } -#define check_rt_color(a, b) check_rt_color_(__LINE__, a, b, false) -#define check_rt_color_todo(a, b) check_rt_color_(__LINE__, a, b, true) -#define check_rt_color_todo_if(a, b, c) check_rt_color_(__LINE__, a, b, c) -static void check_rt_color_(unsigned int line, IDirect3DSurface8 *rt, D3DCOLOR expected_color, bool todo) +#define check_rt_color(a, b) check_rt_color_(__LINE__, a, b, false, 0, false) +#define check_rt_color_broken(a, b, c, d) check_rt_color_(__LINE__, a, b, false, c, d) +#define check_rt_color_todo(a, b) check_rt_color_(__LINE__, a, b, true, 0, false) +#define check_rt_color_todo_if(a, b, c) check_rt_color_(__LINE__, a, b, c, 0, false) +static void check_rt_color_(unsigned int line, IDirect3DSurface8 *rt, D3DCOLOR expected_color, bool todo, + D3DCOLOR broken_color, bool is_broken) { unsigned int color = 0xdeadbeef; struct surface_readback rb; @@ -276,7 +278,8 @@ static void check_rt_color_(unsigned int line, IDirect3DSurface8 *rt, D3DCOLOR e } release_surface_readback(&rb); todo_wine_if (todo) - ok_(__FILE__, line)(color == expected_color, "Got unexpected color 0x%08x.\n", color); + ok_(__FILE__, line)(color == expected_color || broken(is_broken && color == broken_color), + "Got unexpected color 0x%08x.\n", color); } static IDirect3DDevice8 *create_device(IDirect3D8 *d3d, HWND device_window, HWND focus_window, BOOL windowed) @@ -12189,7 +12192,8 @@ static void test_mipmap_upload(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); draw_textured_quad(&context, texture); - check_rt_color(context.backbuffer, 0x00111111 * (j + 1)); + /* AMD Windows drivers don't sample from sysmem textures. */ + check_rt_color_broken(context.backbuffer, 0x00111111 * (j + 1), 0x00000000, pools[i] == D3DPOOL_SYSTEMMEM); winetest_pop_context(); }

1 0

Davide Beatrici : winealsa: Use dedicated macros to call interface functions.
by Alexandre Julliard 25 Apr '23

25 Apr '23

Module: wine Branch: master Commit: 687d5019abfc6b4bbe4d0dae4e5e7337c7eb16fa URL: https://gitlab.winehq.org/wine/wine/-/commit/687d5019abfc6b4bbe4d0dae4e5e73… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat Apr 22 00:44:30 2023 +0200 winealsa: Use dedicated macros to call interface functions. --- dlls/winealsa.drv/mmdevdrv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 049abd53f41..cab960cd838 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1191,13 +1191,13 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface( static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface) { ACImpl *This = impl_from_IAudioRenderClient(iface); - return AudioClient_AddRef(&This->IAudioClient3_iface); + return IAudioClient3_AddRef(&This->IAudioClient3_iface); } static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) { ACImpl *This = impl_from_IAudioRenderClient(iface); - return AudioClient_Release(&This->IAudioClient3_iface); + return IAudioClient3_Release(&This->IAudioClient3_iface); } static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, @@ -1510,7 +1510,7 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) ret->client = client; if(client){ ret->session = client->session; - AudioClient_AddRef(&client->IAudioClient3_iface); + IAudioClient3_AddRef(&client->IAudioClient3_iface); } return ret; @@ -1558,7 +1558,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) sessions_lock(); This->client->session_wrapper = NULL; sessions_unlock(); - AudioClient_Release(&This->client->IAudioClient3_iface); + IAudioClient3_Release(&This->client->IAudioClient3_iface); } HeapFree(GetProcessHeap(), 0, This); } @@ -1783,13 +1783,13 @@ static HRESULT WINAPI SimpleAudioVolume_QueryInterface( static ULONG WINAPI SimpleAudioVolume_AddRef(ISimpleAudioVolume *iface) { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); - return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface); } static ULONG WINAPI SimpleAudioVolume_Release(ISimpleAudioVolume *iface) { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); - return AudioSessionControl_Release(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface); } static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( @@ -2065,13 +2065,13 @@ static HRESULT WINAPI ChannelAudioVolume_QueryInterface( static ULONG WINAPI ChannelAudioVolume_AddRef(IChannelAudioVolume *iface) { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); - return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface); } static ULONG WINAPI ChannelAudioVolume_Release(IChannelAudioVolume *iface) { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); - return AudioSessionControl_Release(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface); } static HRESULT WINAPI ChannelAudioVolume_GetChannelCount(

1 0

Davide Beatrici : winecoreaudio: Use dedicated macros to call interface functions.
by Alexandre Julliard 25 Apr '23

25 Apr '23

Module: wine Branch: master Commit: 93fae6885b5d2444587469d151a9c4ea6c8b60eb URL: https://gitlab.winehq.org/wine/wine/-/commit/93fae6885b5d2444587469d151a9c4… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat Apr 22 00:45:14 2023 +0200 winecoreaudio: Use dedicated macros to call interface functions. --- dlls/winecoreaudio.drv/mmdevdrv.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 0ec1fc63c60..dc492d4affe 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1156,13 +1156,13 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface( static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface) { ACImpl *This = impl_from_IAudioRenderClient(iface); - return AudioClient_AddRef(&This->IAudioClient3_iface); + return IAudioClient3_AddRef(&This->IAudioClient3_iface); } static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) { ACImpl *This = impl_from_IAudioRenderClient(iface); - return AudioClient_Release(&This->IAudioClient3_iface); + return IAudioClient3_Release(&This->IAudioClient3_iface); } static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, @@ -1509,7 +1509,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) if(!ref){ if(This->client){ This->client->session_wrapper = NULL; - AudioClient_Release(&This->client->IAudioClient3_iface); + IAudioClient3_Release(&This->client->IAudioClient3_iface); } HeapFree(GetProcessHeap(), 0, This); } @@ -1736,13 +1736,13 @@ static HRESULT WINAPI SimpleAudioVolume_QueryInterface( static ULONG WINAPI SimpleAudioVolume_AddRef(ISimpleAudioVolume *iface) { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); - return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface); } static ULONG WINAPI SimpleAudioVolume_Release(ISimpleAudioVolume *iface) { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); - return AudioSessionControl_Release(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface); } static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( @@ -2016,13 +2016,13 @@ static HRESULT WINAPI ChannelAudioVolume_QueryInterface( static ULONG WINAPI ChannelAudioVolume_AddRef(IChannelAudioVolume *iface) { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); - return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface); } static ULONG WINAPI ChannelAudioVolume_Release(IChannelAudioVolume *iface) { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); - return AudioSessionControl_Release(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface); } static HRESULT WINAPI ChannelAudioVolume_GetChannelCount(

1 0

Davide Beatrici : wineoss: Use dedicated macros to call interface functions.
by Alexandre Julliard 25 Apr '23

25 Apr '23

Module: wine Branch: master Commit: 22018db18df57131dda6618119867344fc8e335c URL: https://gitlab.winehq.org/wine/wine/-/commit/22018db18df57131dda66181198673… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat Apr 22 00:45:27 2023 +0200 wineoss: Use dedicated macros to call interface functions. --- dlls/wineoss.drv/mmdevdrv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index ccabbf352a7..5a27f9e09bf 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1147,13 +1147,13 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface( static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface) { ACImpl *This = impl_from_IAudioRenderClient(iface); - return AudioClient_AddRef(&This->IAudioClient3_iface); + return IAudioClient3_AddRef(&This->IAudioClient3_iface); } static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) { ACImpl *This = impl_from_IAudioRenderClient(iface); - return AudioClient_Release(&This->IAudioClient3_iface); + return IAudioClient3_Release(&This->IAudioClient3_iface); } static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, @@ -1459,7 +1459,7 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) ret->client = client; if(client){ ret->session = client->session; - AudioClient_AddRef(&client->IAudioClient3_iface); + IAudioClient3_AddRef(&client->IAudioClient3_iface); } return ret; @@ -1507,7 +1507,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) sessions_lock(); This->client->session_wrapper = NULL; sessions_unlock(); - AudioClient_Release(&This->client->IAudioClient3_iface); + IAudioClient3_Release(&This->client->IAudioClient3_iface); } HeapFree(GetProcessHeap(), 0, This); } @@ -1732,13 +1732,13 @@ static HRESULT WINAPI SimpleAudioVolume_QueryInterface( static ULONG WINAPI SimpleAudioVolume_AddRef(ISimpleAudioVolume *iface) { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); - return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface); } static ULONG WINAPI SimpleAudioVolume_Release(ISimpleAudioVolume *iface) { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); - return AudioSessionControl_Release(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface); } static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( @@ -2011,13 +2011,13 @@ static HRESULT WINAPI ChannelAudioVolume_QueryInterface( static ULONG WINAPI ChannelAudioVolume_AddRef(IChannelAudioVolume *iface) { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); - return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface); } static ULONG WINAPI ChannelAudioVolume_Release(IChannelAudioVolume *iface) { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); - return AudioSessionControl_Release(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface); } static HRESULT WINAPI ChannelAudioVolume_GetChannelCount(

1 0

Davide Beatrici : winepulse: Use dedicated macros to call interface functions.
by Alexandre Julliard 25 Apr '23

25 Apr '23

Module: wine Branch: master Commit: 8d9c12723fab27a35223f335d0a8d20a864ce801 URL: https://gitlab.winehq.org/wine/wine/-/commit/8d9c12723fab27a35223f335d0a8d2… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat Apr 22 00:45:41 2023 +0200 winepulse: Use dedicated macros to call interface functions. --- dlls/winepulse.drv/mmdevdrv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 12d67c45c4f..920d7a964eb 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1391,13 +1391,13 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface( static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface) { ACImpl *This = impl_from_IAudioRenderClient(iface); - return AudioClient_AddRef(&This->IAudioClient3_iface); + return IAudioClient3_AddRef(&This->IAudioClient3_iface); } static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) { ACImpl *This = impl_from_IAudioRenderClient(iface); - return AudioClient_Release(&This->IAudioClient3_iface); + return IAudioClient3_Release(&This->IAudioClient3_iface); } static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, @@ -1886,7 +1886,7 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) ret->client = client; if (client) { ret->session = client->session; - AudioClient_AddRef(&client->IAudioClient3_iface); + IAudioClient3_AddRef(&client->IAudioClient3_iface); } return ret; @@ -1932,7 +1932,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) if (!ref) { if (This->client) { This->client->session_wrapper = NULL; - AudioClient_Release(&This->client->IAudioClient3_iface); + IAudioClient3_Release(&This->client->IAudioClient3_iface); } HeapFree(GetProcessHeap(), 0, This); } @@ -2156,13 +2156,13 @@ static HRESULT WINAPI SimpleAudioVolume_QueryInterface( static ULONG WINAPI SimpleAudioVolume_AddRef(ISimpleAudioVolume *iface) { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); - return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface); } static ULONG WINAPI SimpleAudioVolume_Release(ISimpleAudioVolume *iface) { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); - return AudioSessionControl_Release(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface); } static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( @@ -2279,13 +2279,13 @@ static HRESULT WINAPI ChannelAudioVolume_QueryInterface( static ULONG WINAPI ChannelAudioVolume_AddRef(IChannelAudioVolume *iface) { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); - return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface); } static ULONG WINAPI ChannelAudioVolume_Release(IChannelAudioVolume *iface) { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); - return AudioSessionControl_Release(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface); } static HRESULT WINAPI ChannelAudioVolume_GetChannelCount(

1 0

Conor McCarthy : vkd3d: Ensure descriptors are pointer aligned.
by Alexandre Julliard 25 Apr '23

25 Apr '23

Module: vkd3d Branch: master Commit: 505c8c5a2f4ddecb03128370a3381f276efdfe7c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/505c8c5a2f4ddecb03128370a3381… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Apr 13 00:44:00 2023 +1000 vkd3d: Ensure descriptors are pointer aligned. The descriptor structure contains pointer and size types. --- libs/vkd3d/vkd3d_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index ab88f8bf..2128acd8 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -866,7 +866,7 @@ struct d3d12_descriptor_heap struct d3d12_descriptor_heap_vk_set vk_descriptor_sets[VKD3D_SET_INDEX_COUNT]; struct vkd3d_mutex vk_sets_mutex; - BYTE descriptors[]; + uint8_t DECLSPEC_ALIGN(sizeof(void *)) descriptors[]; }; static inline struct d3d12_descriptor_heap *d3d12_desc_get_descriptor_heap(const struct d3d12_desc *descriptor)

1 0

Conor McCarthy : vkd3d: Delay writing Vulkan descriptors until submitted to a queue.
by Alexandre Julliard 25 Apr '23

25 Apr '23

Module: vkd3d Branch: master Commit: e63201a7a3970da569a0723613d7d98e93146edc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e63201a7a3970da569a0723613d7d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Apr 13 11:18:28 2023 +1000 vkd3d: Delay writing Vulkan descriptors until submitted to a queue. Eliminates vk_sets_mutex. Performance on average may be lower until the descriptor mutexes are replaced and Vulkan writes are buffered to reduce thunk calls. --- configure.ac | 2 + include/private/vkd3d_common.h | 1 + libs/vkd3d/command.c | 50 ++++++- libs/vkd3d/device.c | 155 +------------------ libs/vkd3d/resource.c | 328 ++++++++++++++++------------------------- libs/vkd3d/vkd3d_private.h | 51 ++++++- 6 files changed, 220 insertions(+), 367 deletions(-)

1 0

Conor McCarthy : vkd3d: Use atomic exchange for descriptor writes.
by Alexandre Julliard 25 Apr '23

25 Apr '23

Module: vkd3d Branch: master Commit: f50e53e7c9e3d7bcd1197eb71ae251f4b320a3bf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f50e53e7c9e3d7bcd1197eb71ae25… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Apr 13 15:32:22 2023 +1000 vkd3d: Use atomic exchange for descriptor writes. The descriptor component of struct d3d12_desc is replaced with a union containing a pointer which can be swapped out using InterlockedExchangePointer(). To make it safe to increment the refcount of such an object it is necessary to cache freed objects. Elimination of the descriptor mutexes on games which use multithreaded descriptor writes nearly doubles framerate on recent hardware. --- libs/vkd3d/command.c | 77 +++++----- libs/vkd3d/device.c | 31 ++-- libs/vkd3d/resource.c | 349 ++++++++++++++++++++++----------------------- libs/vkd3d/vkd3d_private.h | 176 ++++++++++++++++------- 4 files changed, 358 insertions(+), 275 deletions(-)

1 0