From 6c9b695a9c212f332132230e3632c8532ebafedf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Thu, 8 Jan 2015 16:39:48 +0000 Subject: [PATCH] st/wgl: Ignore ulVersion in DrvValidateVersion. We never used ulVersion for proper version checks. Most 3rd party drivers use version 1, but recently NVIDIA OpenGL driver started using a different version number, 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. Reviewed-by: Brian Paul --- src/gallium/state_trackers/wgl/stw_device.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/gallium/state_trackers/wgl/stw_device.c b/src/gallium/state_trackers/wgl/stw_device.c index 025dbdc8384..25b6341ecad 100644 --- a/src/gallium/state_trackers/wgl/stw_device.c +++ b/src/gallium/state_trackers/wgl/stw_device.c @@ -213,6 +213,14 @@ 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.30.2