Skip to content

Commit 42bc198

Browse files
committed
glx: Remove a few lingering traces of __GLXscreen.GLXVersion
The GLXversion member of the __GLXscreen struct is just cruft since commit ad5c0d9, 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 <[email protected]> Signed-off-by: Jon TURNEY <[email protected]>
1 parent 005e68b commit 42bc198

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

glx/glxscreens.h

-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ struct __GLXscreen {
142142
char *GLextensions;
143143

144144
char *GLXvendor;
145-
char *GLXversion;
146145
char *GLXextensions;
147146

148147
/**

hw/dmx/glxProxy/glxscreens.h

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ typedef struct {
4343
GLint *isGLXvis;
4444

4545
char *GLXvendor;
46-
char *GLXversion;
4746
char *GLXextensions;
4847

4948
} __GLXscreenInfo;

hw/xquartz/GL/indirect.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,8 @@ static __GLXscreen * __glXAquaScreenProbe(ScreenPtr pScreen) {
477477

478478
__glXScreenInit(&screen->base, pScreen);
479479

480-
screen->base.GLXversion = strdup("1.4");
480+
screen->base.GLXmajor = 1;
481+
screen->base.GLXminor = 4;
481482
screen->base.GLXextensions = strdup("GLX_SGIX_fbconfig "
482483
"GLX_SGIS_multisample "
483484
"GLX_ARB_multisample "

hw/xwin/glx/indirect.c

+2-6
Original file line numberDiff line numberDiff line change
@@ -735,30 +735,26 @@ glxWinScreenProbe(ScreenPtr pScreen)
735735

736736
//
737737
// Override the GLX version (__glXScreenInit() sets it to "1.2")
738-
// if we have all the needed extensionsto operate as a higher version
738+
// if we have all the needed extensions to operate as a higher version
739739
//
740740
// SGIX_fbconfig && SGIX_pbuffer && SGI_make_current_read -> 1.3
741741
// ARB_multisample -> 1.4
742742
//
743743
if (screen->has_WGL_ARB_pbuffer && glx_sgi_make_current_read)
744744
{
745-
free(screen->base.GLXversion);
746-
747745
if (screen->has_WGL_ARB_multisample)
748746
{
749-
screen->base.GLXversion = strdup("1.4");
750747
screen->base.GLXmajor = 1;
751748
screen->base.GLXminor = 4;
752749
}
753750
else
754751
{
755-
screen->base.GLXversion = strdup("1.3");
756752
screen->base.GLXmajor = 1;
757753
screen->base.GLXminor = 3;
758754
}
759-
LogMessage(X_INFO, "AIGLX: Set GLX version to %s\n", screen->base.GLXversion);
760755
}
761756
}
757+
LogMessage(X_INFO, "AIGLX: Set GLX version to %d.%d\n", screen->base.GLXmajor, screen->base.GLXminor);
762758

763759
wglMakeCurrent(NULL, NULL);
764760
wglDeleteContext(hglrc);

0 commit comments

Comments
 (0)