From: Emil Velikov <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
---
src/mesa/drivers/x11/fakeglx.c | 6 ------
src/mesa/drivers/x11/glxapi.c | 20 --------------------
2 files changed, 26 deletions(-)
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index 394800f02e..d2a099f9a2 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -1102,7 +1102,6 @@ choose_visual( Display *dpy, int screen, const int *list,
GLboolean fbConfig )
/* ignore */
break;
-#ifdef GLX_EXT_texture_from_pixmap
case GLX_BIND_TO_TEXTURE_RGB_EXT:
parselist++; /*skip*/
break;
@@ -1124,7 +1123,6 @@ choose_visual( Display *dpy, int screen, const int *list,
GLboolean fbConfig )
case GLX_Y_INVERTED_EXT:
parselist++; /*skip*/
break;
-#endif
case None:
/* end of list */
@@ -1730,7 +1728,6 @@ get_config( XMesaVisual xmvis, int attrib, int *value,
GLboolean fbconfig )
*value = xmvis->visinfo->visualid;
break;
-#ifdef GLX_EXT_texture_from_pixmap
case GLX_BIND_TO_TEXTURE_RGB_EXT:
*value = True; /*XXX*/
break;
@@ -1749,7 +1746,6 @@ get_config( XMesaVisual xmvis, int attrib, int *value,
GLboolean fbconfig )
case GLX_Y_INVERTED_EXT:
*value = True; /*XXX*/
break;
-#endif
default:
return GLX_BAD_ATTRIBUTE;
@@ -2227,7 +2223,6 @@ Fake_glXQueryDrawable( Display *dpy, GLXDrawable draw,
int attribute,
case GLX_FBCONFIG_ID:
*value = xmbuf->xm_visual->visinfo->visualid;
return;
-#ifdef GLX_EXT_texture_from_pixmap
case GLX_TEXTURE_FORMAT_EXT:
*value = xmbuf->TextureFormat;
break;
@@ -2237,7 +2232,6 @@ Fake_glXQueryDrawable( Display *dpy, GLXDrawable draw,
int attribute,
case GLX_MIPMAP_TEXTURE_EXT:
*value = xmbuf->TextureMipmap;
break;
-#endif
default:
return; /* raise BadValue error */
diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c
index 07c1d84283..a807074a86 100644
--- a/src/mesa/drivers/x11/glxapi.c
+++ b/src/mesa/drivers/x11/glxapi.c
@@ -1105,36 +1105,16 @@ const char **
_glxapi_get_extensions(void)
{
static const char *extensions[] = {
-#ifdef GLX_EXT_import_context
"GLX_EXT_import_context",
-#endif
-#ifdef GLX_SGI_video_sync
"GLX_SGI_video_sync",
-#endif
-#ifdef GLX_MESA_copy_sub_buffer
"GLX_MESA_copy_sub_buffer",
-#endif
-#ifdef GLX_MESA_release_buffers
"GLX_MESA_release_buffers",
-#endif
-#ifdef GLX_MESA_pixmap_colormap
"GLX_MESA_pixmap_colormap",
-#endif
-#ifdef GLX_MESA_set_3dfx_mode
"GLX_MESA_set_3dfx_mode",
-#endif
-#ifdef GLX_SGIX_fbconfig
"GLX_SGIX_fbconfig",
-#endif
-#ifdef GLX_SGIX_pbuffer
"GLX_SGIX_pbuffer",
-#endif
-#ifdef GLX_EXT_texture_from_pixmap
"GLX_EXT_texture_from_pixmap",
-#endif
-#ifdef GLX_INTEL_swap_event
"GLX_INTEL_swap_event",
-#endif
NULL
};
return extensions;
--
2.11.0
_______________________________________________
mesa-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
