[Mesa-dev] [PATCH 2/2] st/wgl: Ignore ulVersion in DrvValidateVersion.

[Jose Fonseca]

From: José Fonseca <jfonseca at vmware.com>

We never used ulVersion for proper version checks.

Most 3rd party drivers use version 1, but recently NVIDIA OpenGL driver
started using a version number 1, so the handy trick of renaming Mesa's
ICDs as nvoglv32.dll on Windows machines with NVIDIA hardware for quick
testing of Mesa software renderers stopped working.
---
 src/gallium/state_trackers/wgl/stw_device.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/gallium/state_trackers/wgl/stw_device.c b/src/gallium/state_trackers/wgl/stw_device.c
index 025dbdc..4562355 100644
--- a/src/gallium/state_trackers/wgl/stw_device.c
+++ b/src/gallium/state_trackers/wgl/stw_device.c
@@ -213,6 +213,13 @@ BOOL APIENTRY
 DrvValidateVersion(
    ULONG ulVersion )
 {
-   /* TODO: get the expected version from the winsys */
-   return ulVersion == 1;
+   /* ulVersion is the version reported by the KMD:
+    * - via D3DKMTQueryAdapterInfo(KMTQAITYPE_UMOPENGLINFO) on WDDM,
+    * - or ExtEscape on XPDM and can be used to ensure the KMD and OpenGL ICD
+    *   versions match.
+    *
+    * We should get the expected version number from the winsys, but for now
+    * ignore it. */
+   (void)ulVersion;
+   return TRUE;
 }
-- 
2.1.0