Stefan Dösinger : wined3d: Move the highpart of the driver version to the gl structure.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3188d9ae30d6d3c333df9394a0ed8b68b83d2df6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3188d9ae30d6d3c333df9394a0ed8b68b83d2df6

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Tue Feb  5 22:28:00 2008 +0100

wined3d: Move the highpart of the driver version to the gl structure.

While 6.14 is a sane default, we might want to override it on a
per-driver basis, if we have really old Windows drivers on some cards.

---

 dlls/wined3d/directx.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 622c17e..4d5edb6 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -637,6 +637,12 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) {
         }
         gl_info->gl_driver_version = MAKEDWORD_VERSION(major, minor);
         TRACE_(d3d_caps)("found GL_VERSION  (%s)->%i.%i->(0x%08x)\n", debugstr_a(gl_string), major, minor, gl_info->gl_driver_version);
+        /* Current Windows drivers have versions like 6.14.... (some older have an earlier version) */
+        gl_info->gl_driver_version_hipart = MAKEDWORD_VERSION(6, 14);
+    } else {
+        FIXME("OpenGL driver did not return version information\n");
+        gl_info->gl_driver_version = MAKEDWORD_VERSION(0, 0);
+        gl_info->gl_driver_version_hipart = MAKEDWORD_VERSION(6, 14);
     }
 
     TRACE_(d3d_caps)("found GL_RENDERER (%s)->(0x%04x)\n", debugstr_a(gl_info->gl_renderer), gl_info->gl_card);
@@ -1531,8 +1537,7 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Ad
 
     /* Note dx8 doesn't supply a DeviceName */
     if (NULL != pIdentifier->DeviceName) strcpy(pIdentifier->DeviceName, "\\\\.\\DISPLAY"); /* FIXME: May depend on desktop? */
-    /* Current Windows drivers have versions like 6.14.... (some older have an earlier version) */
-    pIdentifier->DriverVersion->u.HighPart = MAKEDWORD_VERSION(6, 14);
+    pIdentifier->DriverVersion->u.HighPart = Adapters[Adapter].gl_info.gl_driver_version_hipart;
     pIdentifier->DriverVersion->u.LowPart = Adapters[Adapter].gl_info.gl_driver_version;
     *(pIdentifier->VendorId) = Adapters[Adapter].gl_info.gl_vendor;
     *(pIdentifier->DeviceId) = Adapters[Adapter].gl_info.gl_card;