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

Rémi Bernon : winex11: Introduce a new attach_client_window helper.
by Alexandre Julliard 05 Apr '24

05 Apr '24

Module: wine Branch: master Commit: 28cf663e2b746701378f129ac69a886be20da4e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/28cf663e2b746701378f129ac69a88… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 30 17:29:36 2023 +0100 winex11: Introduce a new attach_client_window helper. --- dlls/winex11.drv/window.c | 50 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 23391b069dd..26cfee427ab 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1587,6 +1587,13 @@ Window get_dummy_parent(void) return dummy_parent; } +static void client_window_events_enable( struct x11drv_win_data *data, Window client_window ) +{ + XSaveContext( data->display, client_window, winContext, (char *)data->hwnd ); + XSync( data->display, False ); /* make sure client_window is known from data->display */ + XSelectInput( data->display, client_window, ExposureMask ); +} + static void client_window_events_disable( struct x11drv_win_data *data, Window client_window ) { XSelectInput( data->display, client_window, 0 ); @@ -1613,6 +1620,28 @@ static void detach_client_window( struct x11drv_win_data *data, Window client_wi } +/********************************************************************** + * attach_client_window + */ +static void attach_client_window( struct x11drv_win_data *data, Window client_window ) +{ + if (data->client_window == client_window || !client_window) return; + + TRACE( "%p/%lx attaching client window %lx\n", data->hwnd, data->whole_window, client_window ); + + detach_client_window( data, data->client_window ); + + if (data->whole_window) + { + client_window_events_enable( data, client_window ); + XReparentWindow( gdi_display, client_window, data->whole_window, data->client_rect.left - data->whole_rect.left, + data->client_rect.top - data->whole_rect.top ); + } + + data->client_window = client_window; +} + + /********************************************************************** * destroy_client_window */ @@ -1682,9 +1711,7 @@ Window create_client_window( HWND hwnd, const XVisualInfo *visual, Colormap colo if (data->whole_window) { XFlush( gdi_display ); /* make sure client_window is created for XSelectInput */ - XSaveContext( data->display, data->client_window, winContext, (char *)data->hwnd ); - XSync( data->display, False ); /* make sure client_window is known from data->display */ - XSelectInput( data->display, data->client_window, ExposureMask ); + client_window_events_enable( data, data->client_window ); } TRACE( "%p xwin %lx/%lx\n", data->hwnd, data->whole_window, data->client_window ); } @@ -1832,7 +1859,6 @@ void set_window_visual( struct x11drv_win_data *data, const XVisualInfo *vis, BO { BOOL same_visual = (data->vis.visualid == vis->visualid); Window client_window = data->client_window; - Window whole_window = data->whole_window; if (!data->use_alpha == !use_alpha && same_visual) return; if (data->surface) window_surface_release( data->surface ); @@ -1840,18 +1866,14 @@ void set_window_visual( struct x11drv_win_data *data, const XVisualInfo *vis, BO data->use_alpha = use_alpha; if (same_visual) return; - data->client_window = 0; - destroy_whole_window( data, client_window != 0 /* don't destroy whole_window until reparented */ ); + client_window = data->client_window; + /* detach the client before re-creating whole_window */ + detach_client_window( data, client_window ); + destroy_whole_window( data, FALSE ); data->vis = *vis; create_whole_window( data ); - if (!client_window) return; - /* move the client to the new parent */ - XReparentWindow( gdi_display, client_window, data->whole_window, - data->client_rect.left - data->whole_rect.left, - data->client_rect.top - data->whole_rect.top ); - data->client_window = client_window; - XSync( gdi_display, False ); /* make sure XReparentWindow requests have completed before destroying whole_window */ - XDestroyWindow( data->display, whole_window ); + /* attach the client back to the re-created whole_window */ + attach_client_window( data, client_window ); }

1 0

Alexandre Julliard : Release 9.6.
by Alexandre Julliard 05 Apr '24

05 Apr '24

Module: wine Branch: master Commit: 8a3b0d7bc317aada750769af8f82762c7001acad URL: https://gitlab.winehq.org/wine/wine/-/commit/8a3b0d7bc317aada750769af8f8276… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 19:03:05 2024 +0200 Release 9.6. --- ANNOUNCE.md | 592 +++++++++++++++++++++++------------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 235 insertions(+), 378 deletions(-)

1 0

Tag wine-9.6 : Alexandre Julliard : Release 9.6
by Alexandre Julliard 05 Apr '24

05 Apr '24

Module: wine Branch: refs/tags/wine-9.6 Tag: a8cb8def2ca4d9a05d1a158c3bf55b057246296b URL: https://gitlab.winehq.org/wine/wine/-/tags/a8cb8def2ca4d9a05d1a158c3bf55b05… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 19:03:05 2024 +0200 Release 9.6

1 0

Zhiyi Zhang : winemac.drv: Show the window after setting layered attributes.
by Alexandre Julliard 05 Apr '24

05 Apr '24

Module: wine Branch: master Commit: ffc02008a5475d0295f7e9aa738769ee03fd694d URL: https://gitlab.winehq.org/wine/wine/-/commit/ffc02008a5475d0295f7e9aa738769… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Apr 5 15:24:00 2024 +0800 winemac.drv: Show the window after setting layered attributes. Show the window after setting layered attributes in macdrv_UpdateLayeredWindow(). This corresponds to a22dd45 for winex11.drv. Fix a regression from 8892b79, which called set_window_pos() before calling USER_Driver->pUpdateLayeredWindow(). Fix Active Trader Pro doesn't show splash screen at startup on macOS. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51984 --- dlls/winemac.drv/window.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 67f45d301df..a04ff5fd4c9 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1930,6 +1930,11 @@ BOOL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, else set_surface_use_alpha(surface, TRUE); if (surface) window_surface_add_ref(surface); + + /* Since layered attributes are now set, can now show the window */ + if (data->cocoa_window && !data->on_screen && NtUserGetWindowLongW(hwnd, GWL_STYLE) & WS_VISIBLE) + show_window(data); + release_win_data(data); if (!surface) return FALSE;

1 0

Henri Verbeet : tests: Free the shader blobs once we're done with them in test_create_pipeline_state(). (Valgrind).
by Alexandre Julliard 04 Apr '24

04 Apr '24

Module: vkd3d Branch: master Commit: 4f589356f1195bb4cf54c60b6a8b3f751ba4dd32 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4f589356f1195bb4cf54c60b6a8b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 3 18:06:24 2024 +0200 tests: Free the shader blobs once we're done with them in test_create_pipeline_state(). (Valgrind). --- tests/d3d12.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index a374025f..b8d20a58 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3399,12 +3399,15 @@ static void test_create_pipeline_state(void) NULL, /* fill in dynamically */ }; - D3D12_SHADER_BYTECODE cs = shader_bytecode_from_blob(compile_shader(cs_code, sizeof(cs_code) - 1, "cs_4_0")); - D3D12_SHADER_BYTECODE ps = shader_bytecode_from_blob(compile_shader(ps_code, sizeof(ps_code) - 1, "ps_4_0")); - D3D12_SHADER_BYTECODE vs = shader_bytecode_from_blob(compile_shader(vs_code, sizeof(vs_code) - 1, "vs_4_0")); - const struct d3d12_shader_bytecode_subobject vs_subobject = { D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VS, vs }; - const struct d3d12_shader_bytecode_subobject ps_subobject = { D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PS, ps }; - const struct d3d12_shader_bytecode_subobject cs_subobject = { D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_CS, cs }; + ID3D10Blob *cs = compile_shader(cs_code, sizeof(cs_code) - 1, "cs_4_0"); + ID3D10Blob *ps = compile_shader(ps_code, sizeof(ps_code) - 1, "ps_4_0"); + ID3D10Blob *vs = compile_shader(vs_code, sizeof(vs_code) - 1, "vs_4_0"); + const struct d3d12_shader_bytecode_subobject vs_subobject = { D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VS, + shader_bytecode_from_blob(vs) }; + const struct d3d12_shader_bytecode_subobject ps_subobject = { D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PS, + shader_bytecode_from_blob(ps) }; + const struct d3d12_shader_bytecode_subobject cs_subobject = { D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_CS, + shader_bytecode_from_blob(cs) }; static const D3D12_SO_DECLARATION_ENTRY so_entries[] = { @@ -3683,14 +3686,14 @@ static void test_create_pipeline_state(void) if (!(device = create_device())) { skip("Failed to create device.\n"); - return; + goto cleanup; } if (ID3D12Device_QueryInterface(device, &IID_ID3D12Device2, (void **)&device2)) { skip("ID3D12Device2 not supported.\n"); ID3D12Device_Release(device); - return; + goto cleanup; } root_signature_desc.NumParameters = 0; @@ -3740,6 +3743,10 @@ static void test_create_pipeline_state(void) ok(refcount == 1, "ID3D12Device2 has %u references left.\n", (unsigned int)refcount); refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +cleanup: + ID3D10Blob_Release(vs); + ID3D10Blob_Release(ps); + ID3D10Blob_Release(cs); } static void test_create_fence(void)

1 0

Giovanni Mascellani : ci: Build the macOS image each time the Linux image is built.
by Alexandre Julliard 04 Apr '24

04 Apr '24

Module: vkd3d Branch: master Commit: 9c0d04c86204fd360a7528faf2b53acc7301b598 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9c0d04c86204fd360a7528faf2b53… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Apr 4 11:49:44 2024 +0200 ci: Build the macOS image each time the Linux image is built. --- gitlab/image.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gitlab/image.yml b/gitlab/image.yml index c93ea0d6..8b235a66 100644 --- a/gitlab/image.yml +++ b/gitlab/image.yml @@ -19,6 +19,10 @@ image-linux: - sed -i "1iFROM $IMAGE_SOURCE" "$DOCKER_FILE" - /kaniko/executor --context "$CI_PROJECT_DIR" --dockerfile "$DOCKER_FILE" --destination "$IMAGE_LOCAL" +# Job `image-mac' must be run each time the pipeline is run on a push, +# otherwise macOS artifacts are not regenerated and macOS jobs cannot find them. +# So we add a dependency on image.docker too, even if that file is not really +# used for macOS. image-mac: stage: image rules: @@ -26,6 +30,7 @@ image-mac: changes: - .gitlab-ci.yml - gitlab/image.yml + - gitlab/image.docker interruptible: true tags: - mac

1 0

Stefan Dösinger : vkd3d: Add ID3D12Device9 interface stubs.
by Alexandre Julliard 04 Apr '24

04 Apr '24

Module: vkd3d Branch: master Commit: d5c89051ddb1e0a4588e441aab31c02dec505b2a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d5c89051ddb1e0a4588e441aab31c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 3 14:18:40 2024 +0300 vkd3d: Add ID3D12Device9 interface stubs. --- libs/vkd3d/device.c | 293 +++++++++++++++++++++++++-------------------- libs/vkd3d/resource.c | 2 +- libs/vkd3d/vkd3d_main.c | 4 +- libs/vkd3d/vkd3d_private.h | 12 +- 4 files changed, 172 insertions(+), 139 deletions(-)

1 0

Stefan Dösinger : vkd3d: Add an ID3D12ShaderCacheSession stub.
by Alexandre Julliard 04 Apr '24

04 Apr '24

Module: vkd3d Branch: master Commit: fb87a724974b4fa67b8ef2b33e6574b256862dc3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fb87a724974b4fa67b8ef2b33e657… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 10 12:50:19 2023 +0300 vkd3d: Add an ID3D12ShaderCacheSession stub. --- libs/vkd3d/device.c | 214 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 211 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 0566e64f..fc777393 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2523,6 +2523,199 @@ static void vkd3d_desc_object_cache_cleanup(struct vkd3d_desc_object_cache *cach } } +/* ID3D12ShaderCacheSession */ +struct d3d12_cache_session +{ + ID3D12ShaderCacheSession ID3D12ShaderCacheSession_iface; + unsigned int refcount; + + struct d3d12_device *device; + struct vkd3d_private_store private_store; +}; + +static inline struct d3d12_cache_session *impl_from_ID3D12ShaderCacheSession(ID3D12ShaderCacheSession *iface) +{ + return CONTAINING_RECORD(iface, struct d3d12_cache_session, ID3D12ShaderCacheSession_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d12_cache_session_QueryInterface(ID3D12ShaderCacheSession *iface, + REFIID iid, void **object) +{ + TRACE("iface %p, iid %s, object %p.\n", iface, debugstr_guid(iid), object); + + if (!object) + { + WARN("Output pointer is NULL, returning E_POINTER.\n"); + return E_POINTER; + } + + if (IsEqualGUID(iid, &IID_ID3D12ShaderCacheSession) + || IsEqualGUID(iid, &IID_ID3D12DeviceChild) + || IsEqualGUID(iid, &IID_ID3D12Object) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID3D12ShaderCacheSession_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d12_cache_session_AddRef(ID3D12ShaderCacheSession *iface) +{ + struct d3d12_cache_session *session = impl_from_ID3D12ShaderCacheSession(iface); + unsigned int refcount = vkd3d_atomic_increment_u32(&session->refcount); + + TRACE("%p increasing refcount to %u.\n", session, refcount); + + return refcount; +} + +static void d3d12_cache_session_destroy(struct d3d12_cache_session *session) +{ + struct d3d12_device *device = session->device; + + TRACE("Destroying cache session %p.\n", session); + + vkd3d_private_store_destroy(&session->private_store); + vkd3d_free(session); + + d3d12_device_release(device); +} + +static ULONG STDMETHODCALLTYPE d3d12_cache_session_Release(ID3D12ShaderCacheSession *iface) +{ + struct d3d12_cache_session *session = impl_from_ID3D12ShaderCacheSession(iface); + unsigned int refcount = vkd3d_atomic_decrement_u32(&session->refcount); + + TRACE("%p decreasing refcount to %u.\n", session, refcount); + + if (!refcount) + d3d12_cache_session_destroy(session); + + return refcount; +} + +static HRESULT STDMETHODCALLTYPE d3d12_cache_session_GetPrivateData(ID3D12ShaderCacheSession *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d12_cache_session *session = impl_from_ID3D12ShaderCacheSession(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_get_private_data(&session->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d12_cache_session_SetPrivateData(ID3D12ShaderCacheSession *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d12_cache_session *session = impl_from_ID3D12ShaderCacheSession(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_set_private_data(&session->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d12_cache_session_SetPrivateDataInterface( + ID3D12ShaderCacheSession *iface, REFGUID guid, const IUnknown *data) +{ + struct d3d12_cache_session *session = impl_from_ID3D12ShaderCacheSession(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return vkd3d_set_private_data_interface(&session->private_store, guid, data); +} + +static HRESULT STDMETHODCALLTYPE d3d12_cache_session_SetName(ID3D12ShaderCacheSession *iface, + const WCHAR *name) +{ + struct d3d12_cache_session *session = impl_from_ID3D12ShaderCacheSession(iface); + + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, session->device->wchar_size)); + + return name ? S_OK : E_INVALIDARG; +} + +static HRESULT STDMETHODCALLTYPE d3d12_cache_session_GetDevice(ID3D12ShaderCacheSession *iface, + REFIID iid, void **device) +{ + struct d3d12_cache_session *session = impl_from_ID3D12ShaderCacheSession(iface); + + TRACE("iface %p, iid %s, device %p.\n", iface, debugstr_guid(iid), device); + + return d3d12_device_query_interface(session->device, iid, device); +} + +static HRESULT STDMETHODCALLTYPE d3d12_cache_session_FindValue(ID3D12ShaderCacheSession *iface, + const void *key, UINT key_size, void *value, UINT *value_size) +{ + FIXME("iface %p, key %p, key_size %#x, value %p, value_size %p stub!\n", + iface, key, key_size, value, value_size); + + return DXGI_ERROR_NOT_FOUND; +} + +static HRESULT STDMETHODCALLTYPE d3d12_cache_session_StoreValue(ID3D12ShaderCacheSession *iface, + const void *key, UINT key_size, const void *value, UINT value_size) +{ + FIXME("iface %p, key %p, key_size %#x, value %p, value_size %u stub!\n", iface, key, key_size, + value, value_size); + + return E_NOTIMPL; +} + +static void STDMETHODCALLTYPE d3d12_cache_session_SetDeleteOnDestroy(ID3D12ShaderCacheSession *iface) +{ + FIXME("iface %p stub!\n", iface); +} + +static D3D12_SHADER_CACHE_SESSION_DESC * STDMETHODCALLTYPE d3d12_cache_session_GetDesc( + ID3D12ShaderCacheSession *iface, D3D12_SHADER_CACHE_SESSION_DESC *desc) +{ + FIXME("stub %p!\n", iface); + return desc; +} + +static const struct ID3D12ShaderCacheSessionVtbl d3d12_cache_session_vtbl = +{ + /* IUnknown methods */ + d3d12_cache_session_QueryInterface, + d3d12_cache_session_AddRef, + d3d12_cache_session_Release, + /* ID3D12Object methods */ + d3d12_cache_session_GetPrivateData, + d3d12_cache_session_SetPrivateData, + d3d12_cache_session_SetPrivateDataInterface, + d3d12_cache_session_SetName, + /* ID3D12DeviceChild methods */ + d3d12_cache_session_GetDevice, + /* ID3D12ShaderCacheSession methods */ + d3d12_cache_session_FindValue, + d3d12_cache_session_StoreValue, + d3d12_cache_session_SetDeleteOnDestroy, + d3d12_cache_session_GetDesc, +}; + +static HRESULT d3d12_cache_session_init(struct d3d12_cache_session *session, + struct d3d12_device *device, const D3D12_SHADER_CACHE_SESSION_DESC *desc) +{ + HRESULT hr; + + session->ID3D12ShaderCacheSession_iface.lpVtbl = &d3d12_cache_session_vtbl; + session->refcount = 1; + + if (FAILED(hr = vkd3d_private_store_init(&session->private_store))) + return hr; + + d3d12_device_add_ref(session->device = device); + + return S_OK; +} + /* ID3D12Device */ static inline struct d3d12_device *impl_from_ID3D12Device9(ID3D12Device9 *iface) { @@ -4634,10 +4827,25 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints1(ID3D12Device9 static HRESULT STDMETHODCALLTYPE d3d12_device_CreateShaderCacheSession(ID3D12Device9 *iface, const D3D12_SHADER_CACHE_SESSION_DESC *desc, REFIID iid, void **session) { - FIXME("iface %p, desc %p, iid %s, session %p stub!\n", iface, desc, debugstr_guid(iid), - session); + struct d3d12_device *device = impl_from_ID3D12Device9(iface); + struct d3d12_cache_session *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, iid %s, session %p.\n", iface, desc, debugstr_guid(iid), session); + + if (!(object = vkd3d_malloc(sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d12_cache_session_init(object, device, desc))) + { + vkd3d_free(object); + return hr; + } + + hr = ID3D12ShaderCacheSession_QueryInterface(&object->ID3D12ShaderCacheSession_iface, iid, + session); + ID3D12ShaderCacheSession_Release(&object->ID3D12ShaderCacheSession_iface); + return hr; } static HRESULT STDMETHODCALLTYPE d3d12_device_ShaderCacheControl(ID3D12Device9 *iface,

1 0

Stefan Dösinger : vkd3d: Validate and store shader cache session descriptors.
by Alexandre Julliard 04 Apr '24

04 Apr '24

Module: vkd3d Branch: master Commit: 7c93b5070f2526ee2416334d3d4cf81738661693 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7c93b5070f2526ee2416334d3d4cf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 24 14:42:25 2024 +0300 vkd3d: Validate and store shader cache session descriptors. --- libs/vkd3d/device.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index fc777393..65db8b70 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2531,6 +2531,7 @@ struct d3d12_cache_session struct d3d12_device *device; struct vkd3d_private_store private_store; + D3D12_SHADER_CACHE_SESSION_DESC desc; }; static inline struct d3d12_cache_session *impl_from_ID3D12ShaderCacheSession(ID3D12ShaderCacheSession *iface) @@ -2676,7 +2677,10 @@ static void STDMETHODCALLTYPE d3d12_cache_session_SetDeleteOnDestroy(ID3D12Shade static D3D12_SHADER_CACHE_SESSION_DESC * STDMETHODCALLTYPE d3d12_cache_session_GetDesc( ID3D12ShaderCacheSession *iface, D3D12_SHADER_CACHE_SESSION_DESC *desc) { - FIXME("stub %p!\n", iface); + struct d3d12_cache_session *session = impl_from_ID3D12ShaderCacheSession(iface); + + TRACE("iface %p.\n", iface); + *desc = session->desc; return desc; } @@ -2707,6 +2711,14 @@ static HRESULT d3d12_cache_session_init(struct d3d12_cache_session *session, session->ID3D12ShaderCacheSession_iface.lpVtbl = &d3d12_cache_session_vtbl; session->refcount = 1; + session->desc = *desc; + + if (!session->desc.MaximumValueFileSizeBytes) + session->desc.MaximumValueFileSizeBytes = 128 * 1024 * 1024; + if (!session->desc.MaximumInMemoryCacheSizeBytes) + session->desc.MaximumInMemoryCacheSizeBytes = 1024 * 1024; + if (!session->desc.MaximumInMemoryCacheEntries) + session->desc.MaximumInMemoryCacheEntries = 128; if (FAILED(hr = vkd3d_private_store_init(&session->private_store))) return hr; @@ -4829,10 +4841,40 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateShaderCacheSession(ID3D12Dev { struct d3d12_device *device = impl_from_ID3D12Device9(iface); struct d3d12_cache_session *object; + static const GUID guid_null = {0}; HRESULT hr; + static const UINT valid_flags = D3D12_SHADER_CACHE_FLAG_DRIVER_VERSIONED + | D3D12_SHADER_CACHE_FLAG_USE_WORKING_DIR; + TRACE("iface %p, desc %p, iid %s, session %p.\n", iface, desc, debugstr_guid(iid), session); + if (!desc || !memcmp(&desc->Identifier, &guid_null, sizeof(desc->Identifier))) + { + WARN("No description or identifier, returning E_INVALIDARG.\n"); + return E_INVALIDARG; + } + if (desc->MaximumValueFileSizeBytes > 1024 * 1024 * 1024) + { + WARN("Requested size is larger than 1GiB, returning E_INVALIDARG.\n"); + return E_INVALIDARG; + } + if (desc->Flags & ~valid_flags) + { + WARN("Invalid flags %#x, returning E_INVALIDARG.\n", desc->Flags); + return E_INVALIDARG; + } + if (desc->Mode != D3D12_SHADER_CACHE_MODE_MEMORY && desc->Mode != D3D12_SHADER_CACHE_MODE_DISK) + { + WARN("Invalid mode %#x, returning E_INVALIDARG.\n", desc->Mode); + return E_INVALIDARG; + } + if (!session) + { + WARN("No output pointer, returning S_FALSE.\n"); + return S_FALSE; + } + if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY;

1 0

Stefan Dösinger : tests: Add tests for creating D3D12ShaderCacheSession objects.
by Alexandre Julliard 04 Apr '24

04 Apr '24

Module: vkd3d Branch: master Commit: 8653ce17cfe65117e2eb4c1877e25c6334ece2a0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8653ce17cfe65117e2eb4c1877e25… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 23 12:28:19 2024 +0300 tests: Add tests for creating D3D12ShaderCacheSession objects. --- include/vkd3d_windows.h | 1 + tests/d3d12.c | 182 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 183 insertions(+) diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index 7b0e972d..df26fef3 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -65,6 +65,7 @@ typedef int HRESULT; # define DXGI_ERROR_NOT_FOUND _HRESULT_TYPEDEF_(0x887a0002) # define DXGI_ERROR_MORE_DATA _HRESULT_TYPEDEF_(0x887a0003) # define DXGI_ERROR_UNSUPPORTED _HRESULT_TYPEDEF_(0x887a0004) +# define DXGI_ERROR_ALREADY_EXISTS _HRESULT_TYPEDEF_(0x887a0036) # define D3DERR_INVALIDCALL _HRESULT_TYPEDEF_(0x8876086c) diff --git a/tests/d3d12.c b/tests/d3d12.c index 8e34978f..a374025f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -38264,6 +38264,187 @@ static void test_unused_interpolated_input(void) destroy_test_context(&context); } +static void test_shader_cache(void) +{ + ID3D12ShaderCacheSession *session, *session2; + D3D12_SHADER_CACHE_SESSION_DESC desc = {0}; + unsigned int refcount, base_refcount; + struct test_context context; + ID3D12Device9 *device; + IUnknown *unk, *unk2; + HRESULT hr; + + static const GUID test_guid + = {0xfdb37466, 0x428f, 0x4edf, {0xa3, 0x7f, 0x9b, 0x1d, 0xf4, 0x88, 0xc5, 0xfc}}; + + if (!init_test_context(&context, NULL)) + return; + + hr = ID3D12Device_QueryInterface(context.device, &IID_ID3D12Device9, (void **)&device); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + if (FAILED(hr)) + { + skip("ID3D12Device9 not available, skipping shader cache tests.\n"); + destroy_test_context(&context); + return; + } + + base_refcount = get_refcount(device); + + /* The description needs to be non-NULL and have at least the identifier set. */ + hr = ID3D12Device9_CreateShaderCacheSession(device, NULL, &IID_IUnknown, (void **)&unk); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Device9_CreateShaderCacheSession(device, NULL, &IID_IUnknown, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, &IID_IUnknown, (void **)&unk); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, &IID_IUnknown, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, NULL, (void **)&unk); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + desc.Identifier = test_guid; + desc.Mode = D3D12_SHADER_CACHE_MODE_MEMORY; + if (0) /* This crashes on Windows. */ + { + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, NULL, (void **)&unk); + ok(0, "Expected to crash, hr %#x.\n", hr); + } + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, &IID_IUnknown, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, NULL, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + + /* Default values for sizes and number of entries. */ + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, &IID_ID3D12ShaderCacheSession, + (void **)&session); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + desc = ID3D12ShaderCacheSession_GetDesc(session); + ID3D12ShaderCacheSession_Release(session); + ok(desc.MaximumInMemoryCacheEntries == 128, "Got MaximumInMemoryCacheEntries %u.\n", + desc.MaximumInMemoryCacheEntries); + ok(!desc.Flags, "Got Flags %#x.\n", desc.Flags); + ok(!desc.Version, "Got Version %"PRId64".\n", desc.Version); + ok(desc.MaximumInMemoryCacheSizeBytes == 1024 * 1024, "Got MaximumInMemoryCacheSizeBytes %u.\n", + desc.MaximumInMemoryCacheSizeBytes); + ok(desc.MaximumValueFileSizeBytes == 128 * 1024 * 1024, "Got MaximumValueFileSizeBytes %u.\n", + desc.MaximumValueFileSizeBytes); + + /* A memory size larger than disk size is valid. UINT_MAX is OK for memory size. */ + memset(&desc, 0, sizeof(desc)); + desc.Identifier = test_guid; + desc.MaximumInMemoryCacheSizeBytes = UINT_MAX; + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, &IID_ID3D12ShaderCacheSession, + (void **)&session); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + desc = ID3D12ShaderCacheSession_GetDesc(session); + ID3D12ShaderCacheSession_Release(session); + ok(desc.MaximumInMemoryCacheSizeBytes == UINT_MAX, "Got MaximumInMemoryCacheSizeBytes %u.\n", + desc.MaximumInMemoryCacheSizeBytes); + ok(desc.MaximumValueFileSizeBytes == 128 * 1024 * 1024, "Got MaximumValueFileSizeBytes %u.\n", + desc.MaximumValueFileSizeBytes); + + /* MaximumValueFileSizeBytes is limited to 1 GiB regardless of cache type. */ + desc.MaximumValueFileSizeBytes = 1024 * 1024 * 1024; + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, &IID_ID3D12ShaderCacheSession, + (void **)&session); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12ShaderCacheSession_Release(session); + desc.MaximumValueFileSizeBytes = 1024 * 1024 * 1024 + 1; + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, &IID_ID3D12ShaderCacheSession, + (void **)&session); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.Identifier = test_guid; + desc.MaximumValueFileSizeBytes = 1; + desc.MaximumInMemoryCacheSizeBytes = 1; + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, + &IID_ID3D12ShaderCacheSession, (void **)&session); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + desc = ID3D12ShaderCacheSession_GetDesc(session); + ID3D12ShaderCacheSession_Release(session); + ok(desc.MaximumInMemoryCacheSizeBytes == 1, "Got MaximumInMemoryCacheSizeBytes %u.\n", + desc.MaximumInMemoryCacheSizeBytes); + ok(desc.MaximumValueFileSizeBytes == 1, "Got MaximumValueFileSizeBytes %u.\n", + desc.MaximumValueFileSizeBytes); + + /* Invalid flags and mode are rejected. */ + memset(&desc, 0, sizeof(desc)); + desc.Identifier = test_guid; + desc.Mode = D3D12_SHADER_CACHE_MODE_MEMORY; + desc.Flags = 0x1245670; + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, + &IID_ID3D12ShaderCacheSession, (void **)&session); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + desc.Flags = 0; + desc.Mode = 9876; /* Same for Mode=2, but 2 is more likely to mean something in the future. */ + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, + &IID_ID3D12ShaderCacheSession, (void **)&session); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.Identifier = test_guid; + desc.Mode = D3D12_SHADER_CACHE_MODE_MEMORY; + desc.Version = 12344; + desc.MaximumInMemoryCacheSizeBytes = 32 * 1024; + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + refcount = get_refcount(device); + ok(refcount == base_refcount + 1, "Got unexpected refcount %u.\n", refcount); + + refcount = get_refcount(unk); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + hr = IUnknown_QueryInterface(unk, &IID_ID3D12ShaderCacheSession, (void **)&session); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo ok((IUnknown *)session != unk, "Expected different interface pointers, got %p for both.\n", + session); + hr = ID3D12ShaderCacheSession_QueryInterface(session, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(unk2 == unk, "Got different interface pointers %p and %p.\n", session, unk); + + /* The S_FALSE for CreateSession(session = NULL) does not come from QI. */ + hr = ID3D12ShaderCacheSession_QueryInterface(session, &IID_IUnknown, NULL); + ok(hr == E_POINTER, "Got unexpected hr %#x.\n", hr); + + refcount = get_refcount(unk); + ok(refcount == 3, "Got unexpected refcount %u.\n", refcount); + refcount = get_refcount(session); + ok(refcount == 3, "Got unexpected refcount %u.\n", refcount); + + IUnknown_Release(unk); + IUnknown_Release(unk2); + + /* Ad-hoc testing shows that in-memory sessions are per-process. They are not magically + * shared between processes. If a disk cache is accessed by two processes, it will fail + * with E_INVALIDARG, regardless of version compatibility. */ + desc.Version = 12345; + session2 = (void *)0xdeadbeef; + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, + &IID_ID3D12ShaderCacheSession, (void **)&session2); + todo ok(hr == DXGI_ERROR_ALREADY_EXISTS, "Got unexpected hr %#x.\n", hr); + todo ok(!session2, "Got unexpected pointer %p.\n", session2); + if (session2) + ID3D12ShaderCacheSession_Release(session2); + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, &IID_IUnknown, NULL); + ok(hr == S_FALSE, "NULL outptr: Got hr %#x.\n", hr); + + ID3D12ShaderCacheSession_Release(session); + + refcount = get_refcount(device); + ok(refcount == base_refcount, "Got unexpected refcount %u.\n", refcount); + + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, + &IID_ID3D12ShaderCacheSession, (void **)&session); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12ShaderCacheSession_Release(session); + + ID3D12Device9_Release(device); + destroy_test_context(&context); +} + START_TEST(d3d12) { parse_args(argc, argv); @@ -38448,4 +38629,5 @@ START_TEST(d3d12) run_test(test_get_resource_tiling); run_test(test_hull_shader_punned_array); run_test(test_unused_interpolated_input); + run_test(test_shader_cache); }

1 0