[PATCH 0/1] MR10831: win32u: Bump D3DKMT driver version.
From: Paul Gofman <pgofman@codeweavers.com> --- dlls/win32u/d3dkmt.c | 2 +- dlls/win32u/tests/d3dkmt.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/d3dkmt.c b/dlls/win32u/d3dkmt.c index c7c831d3952..38624583f7d 100644 --- a/dlls/win32u/d3dkmt.c +++ b/dlls/win32u/d3dkmt.c @@ -707,7 +707,7 @@ NTSTATUS WINAPI NtGdiDdDDIQueryAdapterInfo( D3DKMT_QUERYADAPTERINFO *desc ) if (desc->PrivateDriverDataSize < sizeof(*value)) return STATUS_INVALID_PARAMETER; - *value = KMT_DRIVERVERSION_WDDM_1_3; + *value = KMT_DRIVERVERSION_WDDM_3_1; return STATUS_SUCCESS; } default: diff --git a/dlls/win32u/tests/d3dkmt.c b/dlls/win32u/tests/d3dkmt.c index d4ca602e8e4..7a33089b73b 100644 --- a/dlls/win32u/tests/d3dkmt.c +++ b/dlls/win32u/tests/d3dkmt.c @@ -1627,7 +1627,8 @@ static void test_D3DKMTQueryAdapterInfo(void) case KMTQAITYPE_DRIVERVERSION: { D3DKMT_DRIVERVERSION *value = query_adapter_info.pPrivateDriverData; - ok( *value >= KMT_DRIVERVERSION_WDDM_1_3, "Expected %d >= %d.\n", *value, KMT_DRIVERVERSION_WDDM_1_3 ); + ok( *value >= KMT_DRIVERVERSION_WDDM_3_1 || broken( *value >= KMT_DRIVERVERSION_WDDM_1_3 ), + "Expected %d >= %d.\n", *value, KMT_DRIVERVERSION_WDDM_3_1 ); break; } default: -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10831
This helps 3DMark which stopped supporting d3d12 benchmarks (complaining that the GPU doesn't support d3d12) after commit: ``` commit 6e0eab2051b9af5e4a1c63c2eb37cfa59ec75fc1 Author: Zhiyi Zhang <zzhang@codeweavers.com> Date: Tue Feb 11 10:32:08 2025 +0800 win32u: Support KMTQAITYPE_DRIVERVERSION for NtGdiDdDDIQueryAdapterInfo(). ``` It was fine KMTQAITYPE_DRIVERVERSION unsupported and is also fine with the up to date version. KMT_DRIVERVERSION_WDDM_3_1 is what I observe on the up to date Windows 11. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10831#note_139013
This merge request was approved by Rémi Bernon. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10831
participants (3)
-
Paul Gofman -
Paul Gofman (@gofman) -
Rémi Bernon (@rbernon)