H. Verbeet : wined3d: In IWineD3DImpl_FillGLCaps use glGetString instead of

Alexandre Julliard julliard at wine.codeweavers.com
Thu Jan 19 05:46:36 CST 2006


Module: wine
Branch: refs/heads/master
Commit: 093a034f7ffa8dee4d7346737bbb4991bfeae5a0
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=093a034f7ffa8dee4d7346737bbb4991bfeae5a0

Author: H. Verbeet <hverbeet at gmail.com>
Date:   Thu Jan 19 11:55:34 2006 +0100

wined3d: In IWineD3DImpl_FillGLCaps use glGetString instead of
glXGetClientString to retrieve the OpenGL vendor.

---

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

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index b9178a1..466d3e4 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -234,11 +234,11 @@ static BOOL IWineD3DImpl_FillGLCaps(Wine
     if (NULL != display) {
         test = glXQueryVersion(display, &major, &minor);
         gl_info->glx_version = ((major & 0x0000FFFF) << 16) | (minor & 0x0000FFFF);
-        gl_string = glXGetClientString(display, GLX_VENDOR);
     } else {
         FIXME("Display must not be NULL, use glXGetCurrentDisplay or getAdapterDisplay()\n");
-        gl_string = (const char *) glGetString(GL_VENDOR);
     }
+    gl_string = (const char *) glGetString(GL_VENDOR);
+
     TRACE_(d3d_caps)("Filling vendor string %s\n", gl_string);
     if (gl_string != NULL) {
         /* Fill in the GL vendor */




More information about the wine-cvs mailing list