[PATCH 0/1] MR3516: wined3d: Update reported driver versions
Updates reported driver versions Fixes complaints of old drivers in Diablo IV Note: The Intel 31.0.101.4577 driver only actually supports UHD 7XX and above. Should I be trying to track down the last supported driver for each of the previous GPU generations or is it fine to just pretend that we have a 101.4577 driver that supports HD4000+? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3516
From: Evan Tang <etang(a)codeweavers.com> --- dlls/wined3d/directx.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index eb0e5e9bad0..80b06712161 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -238,6 +238,9 @@ ULONG CDECL wined3d_decref(struct wined3d *wined3d) * 24 -> Windows 10 April 2018 Update - WDDM 2.4 * 25 -> Windows 10 October 2018 Update - WDDM 2.5 * 26 -> Windows 10 May 2019 Update - WDDM 2.6 + * 27 -> Windows 10 May 2020 Update - WDDM 2.7 + * 30 -> Windows 11 21H2 - WDDM 3.0 + * 31 -> Windows 11 22H2 - WDDM 3.1 * * "y" is the maximum Direct3D version / feature level the driver supports. * 11 -> 6 @@ -285,7 +288,7 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_AMD_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 10, 1280}, {DRIVER_AMD_R300, DRIVER_MODEL_NT6X, "atiumdag.dll", 10, 741 }, {DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 10, 1280}, - {DRIVER_AMD_RX, DRIVER_MODEL_NT6X, "aticfx32.dll", 15002, 61}, + {DRIVER_AMD_RX, DRIVER_MODEL_NT6X, "aticfx32.dll", 21023, 2010}, /* Adrenalin 23.7.2 */ /* Intel * The drivers are unified but not all versions support all GPUs. At some point the 2k/xp @@ -297,7 +300,7 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_INTEL_GMA3000, DRIVER_MODEL_NT5X, "igxprd32.dll", 10, 5218}, {DRIVER_INTEL_GMA950, DRIVER_MODEL_NT6X, "igdumd32.dll", 10, 1504}, {DRIVER_INTEL_GMA3000, DRIVER_MODEL_NT6X, "igdumd32.dll", 10, 1666}, - {DRIVER_INTEL_HD4000, DRIVER_MODEL_NT6X, "igdumdim32.dll", 15, 4352}, + {DRIVER_INTEL_HD4000, DRIVER_MODEL_NT6X, "igdumdim32.dll", 101, 4577}, /* Nvidia * - Geforce8 and newer is supported by the current 340.52 driver on XP-Win8 @@ -314,7 +317,7 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT6X, "nvd3dum.dll", 13, 783}, {DRIVER_NVIDIA_GEFORCE8, DRIVER_MODEL_NT6X, "nvd3dum.dll", 13, 4052}, {DRIVER_NVIDIA_FERMI, DRIVER_MODEL_NT6X, "nvd3dum.dll", 13, 9135}, - {DRIVER_NVIDIA_KEPLER, DRIVER_MODEL_NT6X, "nvd3dum.dll", 14, 4587}, + {DRIVER_NVIDIA_KEPLER, DRIVER_MODEL_NT6X, "nvd3dum.dll", 15, 3118}, /* 531.18 */ /* Red Hat */ {DRIVER_REDHAT_VIRGL, DRIVER_MODEL_GENERIC, "virgl.dll", 0, 0}, @@ -773,7 +776,7 @@ bool wined3d_driver_info_init(struct wined3d_driver_info *driver_info, break; case 10: - driver_os_version = 26; + driver_os_version = 31; driver_model = DRIVER_MODEL_NT6X; break; @@ -829,6 +832,10 @@ bool wined3d_driver_info_init(struct wined3d_driver_info *driver_info, else if (os_version.dwMajorVersion < 6) driver_feature_level = min(driver_feature_level, 14); + /* Drivers with the OS version 30+ all have the feature level word set to 0 */ + if (driver_os_version >= 30) + driver_feature_level = 0; + driver_info->vendor = gpu_desc->vendor; driver_info->device = gpu_desc->device; wined3d_copy_name(driver_info->description, gpu_desc->description, ARRAY_SIZE(driver_info->description)); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3516
Note: The Intel 31.0.101.4577 driver only actually supports UHD 7XX and above. Should I be trying to track down the last supported driver for each of the previous GPU generations or is it fine to just pretend that we have a 101.4577 driver that supports HD4000+?
I can only guess—and I invite the older and more experienced Direct3D developers to chime in here—but it does sound like a lot of work for something unlikely to matter. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3516#note_41468
This merge request was approved by Zebediah Figura. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3516
Note: The Intel 31.0.101.4577 driver only actually supports UHD 7XX and above. Should I be trying to track down the last supported driver for each of the previous GPU generations or is it fine to just pretend that we have a 101.4577 driver that supports HD4000+?
I can only guess—and I invite the older and more experienced Direct3D developers to chime in here—but it does sound like a lot of work for something unlikely to matter.
Ideally we would, and that's the main purpose of the wined3d_display_driver enumeration. Chances do seem pretty good that we could get away with just reporting the new drivers for the older hardware though... -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3516#note_41536
This merge request was approved by Jan Sikorski. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3516
participants (5)
-
Evan Tang -
Evan Tang (＠etang-cw)
-
Henri Verbeet (＠hverbeet)
-
Jan Sikorski (＠jsikorski)
-
Zebediah Figura (＠zfigura)