diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2011-01-24 18:29:41 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-07-16 13:19:27 -0700 |
| commit | 64ea1ac3208155e8caf740f0b6623997dca0bf69 (patch) | |
| tree | 0c0f902fc6aff6dc17c5c78b798ebeb553400f55 | |
| parent | afb537d56af9a037c4f43d90795fb7e9acb7f9d2 (diff) | |
glx: Remove a few lingering traces of __GLXscreen.GLXVersion
The GLXversion member of the __GLXscreen struct
is just cruft since commit ad5c0d9efa47476ed5cf75c82265c73919e468b4,
when we started returning the minimum GLX version supported by all
of the screens on the display, rather than the maximum version supported
by the server.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
(cherry picked from commit 42bc198775a78b328612427c4c8ed4d17e005ae9)
| -rw-r--r-- | glx/glxscreens.h | 1 | ||||
| -rw-r--r-- | hw/dmx/glxProxy/glxscreens.h | 1 | ||||
| -rw-r--r-- | hw/xquartz/GL/indirect.c | 3 | ||||
| -rw-r--r-- | hw/xwin/glx/indirect.c | 8 |
4 files changed, 4 insertions, 9 deletions
diff --git a/glx/glxscreens.h b/glx/glxscreens.h index 93b4109e0..eb2926045 100644 --- a/glx/glxscreens.h +++ b/glx/glxscreens.h @@ -142,7 +142,6 @@ struct __GLXscreen { char *GLextensions; char *GLXvendor; - char *GLXversion; char *GLXextensions; /** diff --git a/hw/dmx/glxProxy/glxscreens.h b/hw/dmx/glxProxy/glxscreens.h index a57c387fe..da50bdc85 100644 --- a/hw/dmx/glxProxy/glxscreens.h +++ b/hw/dmx/glxProxy/glxscreens.h @@ -43,7 +43,6 @@ typedef struct { GLint *isGLXvis; char *GLXvendor; - char *GLXversion; char *GLXextensions; } __GLXscreenInfo; diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c index c46ba9d8a..e9f0ffa98 100644 --- a/hw/xquartz/GL/indirect.c +++ b/hw/xquartz/GL/indirect.c @@ -496,7 +496,8 @@ static __GLXscreen * __glXAquaScreenProbe(ScreenPtr pScreen) { __glXScreenInit(&screen->base, pScreen); - screen->base.GLXversion = strdup("1.4"); + screen->base.GLXmajor = 1; + screen->base.GLXminor = 4; screen->base.GLXextensions = strdup("GLX_SGIX_fbconfig " "GLX_SGIS_multisample " "GLX_ARB_multisample " diff --git a/hw/xwin/glx/indirect.c b/hw/xwin/glx/indirect.c index c9831f3ea..9c96f0b1b 100644 --- a/hw/xwin/glx/indirect.c +++ b/hw/xwin/glx/indirect.c @@ -689,30 +689,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); |