frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glx: Remove a few lingering traces of __GLXscreen.GLXVersion 

The GLXversion member of the __GLXscreen struct
is just cruft since commit ad5c0d9efa,
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>
This commit is contained in:
Jon TURNEY 2011-01-24 18:29:41 +00:00
parent 005e68ba59
commit 42bc198775
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
glx/glxscreens.h
View File

@ -142,7 +142,6 @@ struct __GLXscreen {
char *GLextensions; char *GLextensions;
char *GLXvendor; char *GLXvendor;
char *GLXversion;
char *GLXextensions; char *GLXextensions;
/** /**

1
hw/dmx/glxProxy/glxscreens.h
View File

@ -43,7 +43,6 @@ typedef struct {
GLint *isGLXvis; GLint *isGLXvis;
char *GLXvendor; char *GLXvendor;
char *GLXversion;
char *GLXextensions; char *GLXextensions;
} __GLXscreenInfo; } __GLXscreenInfo;

3
hw/xquartz/GL/indirect.c
View File

@ -477,7 +477,8 @@ static __GLXscreen * __glXAquaScreenProbe(ScreenPtr pScreen) {
__glXScreenInit(&screen->base, 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 " screen->base.GLXextensions = strdup("GLX_SGIX_fbconfig "
"GLX_SGIS_multisample " "GLX_SGIS_multisample "
"GLX_ARB_multisample " "GLX_ARB_multisample "

8
hw/xwin/glx/indirect.c
View File

@ -735,30 +735,26 @@ glxWinScreenProbe(ScreenPtr pScreen)
// //
// Override the GLX version (__glXScreenInit() sets it to "1.2") // 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 // SGIX_fbconfig && SGIX_pbuffer && SGI_make_current_read -> 1.3
// ARB_multisample -> 1.4 // ARB_multisample -> 1.4
// //
if (screen->has_WGL_ARB_pbuffer && glx_sgi_make_current_read) if (screen->has_WGL_ARB_pbuffer && glx_sgi_make_current_read)
{ {
free(screen->base.GLXversion);
if (screen->has_WGL_ARB_multisample) if (screen->has_WGL_ARB_multisample)
{ {
screen->base.GLXversion = strdup("1.4");
screen->base.GLXmajor = 1; screen->base.GLXmajor = 1;
screen->base.GLXminor = 4; screen->base.GLXminor = 4;
} }
else else
{ {
screen->base.GLXversion = strdup("1.3");
screen->base.GLXmajor = 1; screen->base.GLXmajor = 1;
screen->base.GLXminor = 3; 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); wglMakeCurrent(NULL, NULL);
wglDeleteContext(hglrc); wglDeleteContext(hglrc);