From 3a21da59e59cf11a9113d71e3431c4bd394ff1e8 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 16 Mar 2016 19:05:17 -0400 Subject: glx: Remove default server glx extension string This existed only to be strdup'd and then immediately freed. Reviewed-by: Eric Anholt Reviewed-by: Emil Velikov Signed-off-by: Adam Jackson --- glx/glxdri2.c | 2 -- glx/glxdriswrast.c | 2 -- glx/glxscreens.c | 20 +------------------- 3 files changed, 1 insertion(+), 23 deletions(-) (limited to 'glx') diff --git a/glx/glxdri2.c b/glx/glxdri2.c index 58e60b976..948d653ce 100644 --- a/glx/glxdri2.c +++ b/glx/glxdri2.c @@ -1003,8 +1003,6 @@ __glXDRIscreenProbe(ScreenPtr pScreen) */ buffer_size = __glXGetExtensionString(screen->glx_enable_bits, NULL); if (buffer_size > 0) { - free(screen->base.GLXextensions); - screen->base.GLXextensions = xnfalloc(buffer_size); (void) __glXGetExtensionString(screen->glx_enable_bits, screen->base.GLXextensions); diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c index 924067c79..cb57e9a9a 100644 --- a/glx/glxdriswrast.c +++ b/glx/glxdriswrast.c @@ -495,8 +495,6 @@ __glXDRIscreenProbe(ScreenPtr pScreen) */ buffer_size = __glXGetExtensionString(screen->glx_enable_bits, NULL); if (buffer_size > 0) { - free(screen->base.GLXextensions); - screen->base.GLXextensions = xnfalloc(buffer_size); (void) __glXGetExtensionString(screen->glx_enable_bits, screen->base.GLXextensions); diff --git a/glx/glxscreens.c b/glx/glxscreens.c index b0ad3b7bc..6a1701694 100644 --- a/glx/glxscreens.c +++ b/glx/glxscreens.c @@ -154,26 +154,8 @@ static const char GLServerExtensions[] = "GL_SGIX_shadow_ambient " "GL_SUN_slice_accum "; -/* -** We have made the simplifying assuption that the same extensions are -** supported across all screens in a multi-screen system. -*/ unsigned glxMajorVersion = SERVER_GLX_MAJOR_VERSION; unsigned glxMinorVersion = SERVER_GLX_MINOR_VERSION; -static char GLXServerExtensions[] = - "GLX_ARB_multisample " - "GLX_EXT_visual_info " - "GLX_EXT_visual_rating " - "GLX_EXT_import_context " - "GLX_EXT_texture_from_pixmap " - "GLX_OML_swap_method " - "GLX_SGI_make_current_read " -#ifndef __APPLE__ - "GLX_SGIS_multisample " -#endif - "GLX_SGIX_fbconfig " - "GLX_SGIX_pbuffer " - "GLX_MESA_copy_sub_buffer "; static Bool glxCloseScreen(ScreenPtr pScreen) @@ -329,7 +311,7 @@ __glXScreenInit(__GLXscreen * pGlxScreen, ScreenPtr pScreen) pGlxScreen->pScreen = pScreen; pGlxScreen->GLextensions = strdup(GLServerExtensions); - pGlxScreen->GLXextensions = strdup(GLXServerExtensions); + pGlxScreen->GLXextensions = NULL; /* All GLX providers must support all of the functionality required for at * least GLX 1.2. If the provider supports a higher version, the GLXminor -- cgit v1.2.3