fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 22:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

xlib: remove always true ifdef GLX_EXTENSION guards

Browse source 
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Acked-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Emil Velikov 2017-02-09 13:35:52 +00:00 • committed by Emil Velikov
parent 261d5e4c6d
commit 884fd1262f
2 changed files with 0 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/drivers/x11/fakeglx.c
View file

@ -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 */

20
src/mesa/drivers/x11/glxapi.c
View file

@ -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;