summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2016-03-16 19:05:17 -0400
committerAdam Jackson <ajax@redhat.com>2016-03-30 09:37:41 -0400
commit3a21da59e59cf11a9113d71e3431c4bd394ff1e8 (patch)
tree2da70f65f04e785edb0443bb10cb599b8d27088e
parent44e1c97ca6fe992bbb6ef9ecb0b82a113adfa57e (diff)
glx: Remove default server glx extension string
This existed only to be strdup'd and then immediately freed. Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
-rw-r--r--glx/glxdri2.c2
-rw-r--r--glx/glxdriswrast.c2
-rw-r--r--glx/glxscreens.c20
-rw-r--r--hw/xquartz/GL/indirect.c2
-rw-r--r--hw/xwin/glx/indirect.c2
5 files changed, 1 insertions, 27 deletions
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
diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
index 4e6ab3d13..4f3e2e472 100644
--- a/hw/xquartz/GL/indirect.c
+++ b/hw/xquartz/GL/indirect.c
@@ -566,8 +566,6 @@ __glXAquaScreenProbe(ScreenPtr pScreen)
unsigned int buffer_size =
__glXGetExtensionString(screen->glx_enable_bits, NULL);
if (buffer_size > 0) {
- free(screen->base.GLXextensions);
-
screen->base.GLXextensions = xnfalloc(buffer_size);
__glXGetExtensionString(screen->glx_enable_bits,
screen->base.GLXextensions);
diff --git a/hw/xwin/glx/indirect.c b/hw/xwin/glx/indirect.c
index e4be64228..e515d188b 100644
--- a/hw/xwin/glx/indirect.c
+++ b/hw/xwin/glx/indirect.c
@@ -743,8 +743,6 @@ glxWinScreenProbe(ScreenPtr pScreen)
unsigned int buffer_size =
__glXGetExtensionString(screen->glx_enable_bits, NULL);
if (buffer_size > 0) {
- free(screen->base.GLXextensions);
-
screen->base.GLXextensions = xnfalloc(buffer_size);
__glXGetExtensionString(screen->glx_enable_bits,
screen->base.GLXextensions);