From 036a5b11200fe8371bc2ebfb6a7b31ab43faff50 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 7 Mar 2011 08:34:35 +0000
Subject: Remove GLXversion

---
 xorg-server/glx/glxscreens.h       | 1 -
 xorg-server/hw/xwin/glx/indirect.c | 8 ++------
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'xorg-server')

diff --git a/xorg-server/glx/glxscreens.h b/xorg-server/glx/glxscreens.h
index df7b3b937..e39034243 100644
--- a/xorg-server/glx/glxscreens.h
+++ b/xorg-server/glx/glxscreens.h
@@ -142,7 +142,6 @@ struct __GLXscreen {
     char *GLextensions;
 
     char *GLXvendor;
-    char *GLXversion;
     char *GLXextensions;
 
     /**
diff --git a/xorg-server/hw/xwin/glx/indirect.c b/xorg-server/hw/xwin/glx/indirect.c
index 4367d6990..84d4a34c6 100644
--- a/xorg-server/hw/xwin/glx/indirect.c
+++ b/xorg-server/hw/xwin/glx/indirect.c
@@ -777,30 +777,26 @@ glxWinScreenProbe(ScreenPtr pScreen)
 
       //
       // Override the GLX version (__glXScreenInit() sets it to "1.2")
-      // if we have all the needed extensionsto operate as a higher version
+      // if we have all the needed extensions to operate as a higher version
       //
       // SGIX_fbconfig && SGIX_pbuffer && SGI_make_current_read -> 1.3
       // ARB_multisample -> 1.4
       //
       if (screen->has_WGL_ARB_pbuffer && glx_sgi_make_current_read)
         {
-          free(screen->base.GLXversion);
-
           if (screen->has_WGL_ARB_multisample)
             {
-              screen->base.GLXversion = strdup("1.4");
               screen->base.GLXmajor = 1;
               screen->base.GLXminor = 4;
             }
           else
             {
-              screen->base.GLXversion = strdup("1.3");
               screen->base.GLXmajor = 1;
               screen->base.GLXminor = 3;
             }
-          LogMessage(X_INFO, "AIGLX: Set GLX version to %s\n", screen->base.GLXversion);
         }
     }
+    LogMessage(X_INFO, "AIGLX: Set GLX version to %d.%d\n", screen->base.GLXmajor, screen->base.GLXminor);
 
     wglMakeCurrent(NULL, NULL);
     wglDeleteContext(hglrc);
-- 
cgit v1.2.3