Matteo Bruni : wined3d: Fix / update reported driver model version.

Alexandre Julliard julliard at winehq.org
Tue Jul 14 16:23:38 CDT 2020


Module: wine
Branch: master
Commit: a76475909d362abc8c6ec31588fedcdf0e9c7dbd
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=a76475909d362abc8c6ec31588fedcdf0e9c7dbd

Author: Matteo Bruni <mbruni at codeweavers.com>
Date:   Tue Jul 14 14:10:32 2020 +0200

wined3d: Fix / update reported driver model version.

Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/directx.c | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 454125c146..45f3f61f2f 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -198,20 +198,26 @@ ULONG CDECL wined3d_decref(struct wined3d *wined3d)
     return refcount;
 }
 
-/* Certain applications (Steam) complain if we report an outdated driver version. In general,
- * reporting a driver version is moot because we are not the Windows driver, and we have different
- * bugs, features, etc.
+/* Certain applications (e.g. Steam) complain if we report an outdated driver
+ * version.
  *
  * The driver version has the form "x.y.z.w".
  *
- * "x" is the Windows version the driver is meant for:
+ * "x" is the Windows version / driver model the driver is meant for:
  *  4 -> 95/98/NT4
  *  5 -> 2000
- *  6 -> 2000/XP
- *  7 -> Vista
- *  8 -> Windows 7
- *  9 -> Windows 8
- * 10 -> Windows 10
+ *  6 -> XP
+ *  7 -> Vista - WDDM 1.0
+ *  8 -> Windows 7 - WDDM 1.1
+ *  9 -> Windows 8 - WDDM 1.2
+ * 10 -> Windows 8.1 - WDDM 1.3
+ * 20 -> Windows 10 - WDDM 2.0
+ * 21 -> Windows 10 Anniversary Update - WDDM 2.1
+ * 22 -> Windows 10 Creators Update - WDDM 2.2
+ * 23 -> Windows 10 Fall Creators Update - WDDM 2.3
+ * 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
  *
  * "y" is the maximum Direct3D version the driver supports.
  * y  -> d3d version mapping:
@@ -705,20 +711,25 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info,
                     driver_os_version = 8;
                     driver_model = DRIVER_MODEL_NT6X;
                 }
+                else if (os_version.dwMinorVersion == 2)
+                {
+                    driver_os_version = 9;
+                    driver_model = DRIVER_MODEL_NT6X;
+                }
                 else
                 {
                     if (os_version.dwMinorVersion > 3)
                     {
-                        FIXME("Unhandled OS version %u.%u, reporting Win 8.\n",
+                        FIXME("Unhandled OS version %u.%u, reporting Windows 8.1.\n",
                                 os_version.dwMajorVersion, os_version.dwMinorVersion);
                     }
-                    driver_os_version = 9;
+                    driver_os_version = 10;
                     driver_model = DRIVER_MODEL_NT6X;
                 }
                 break;
 
             case 10:
-                driver_os_version = 10;
+                driver_os_version = 26;
                 driver_model = DRIVER_MODEL_NT6X;
                 break;
 




More information about the wine-cvs mailing list