Reviewed-by: Jeremy Huddleston <[email protected]> On Jun 30, 2011, at 7:30 AM, Jon TURNEY wrote:
> 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. > > Signed-off-by: Jon TURNEY <[email protected]> > --- > glx/glxscreens.h | 1 - > hw/dmx/glxProxy/glxscreens.h | 1 - > hw/xquartz/GL/indirect.c | 3 ++- > hw/xwin/glx/indirect.c | 8 ++------ > 4 files changed, 4 insertions(+), 9 deletions(-) > > diff --git a/glx/glxscreens.h b/glx/glxscreens.h > index 93b4109..eb29260 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 a57c387..da50bdc 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 4116872..4876ab9 100644 > --- a/hw/xquartz/GL/indirect.c > +++ b/hw/xquartz/GL/indirect.c > @@ -477,7 +477,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 bd2a1ad..920755a 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); > -- > 1.7.5.1 > > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel > _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
