diff options
| author | José Fonseca <jfonseca@vmware.com> | 2015-01-08 16:39:48 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2015-01-08 18:57:04 +0000 |
| commit | 6c9b695a9c212f332132230e3632c8532ebafedf (patch) | |
| tree | 3add65fc9752b35c464b1b8cede48c31fb16ea84 /src/gallium/state_trackers/wgl | |
| parent | 0dba2af2fbea78a937a4402f711dc4cea5189966 (diff) | |
| download | external_mesa3d-6c9b695a9c212f332132230e3632c8532ebafedf.zip external_mesa3d-6c9b695a9c212f332132230e3632c8532ebafedf.tar.gz external_mesa3d-6c9b695a9c212f332132230e3632c8532ebafedf.tar.bz2 | |
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 <brianp@vmware.com>
Diffstat (limited to 'src/gallium/state_trackers/wgl')
| -rw-r--r-- | src/gallium/state_trackers/wgl/stw_device.c | 12 |
1 files 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 025dbdc..25b6341 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; } |