[Mesa-dev] [PATCH] includes/GL: remove duplicated extension declarations from glx.h

[Brian Paul]

On 07/30/2015 08:22 AM, Emil Velikov wrote:
> All three of GLX_NV_float_buffer, GLX_EXT_texture_from_pixmap and
> GLX_MESA_query_renderer have been in glxext.h for a while now.
>
> As such we can drop this workaround/hack from the header.
>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> ---
>
> Not to mention that glxext.h honours GLX_GLXEXT_PROTOTYPES and provides
> the relevant typedefs and/or function declarations when appropriate.
>
> -Emil
>
>   include/GL/glx.h | 88 --------------------------------------------------------
>   1 file changed, 88 deletions(-)
>
> diff --git a/include/GL/glx.h b/include/GL/glx.h
> index 78f5052..d612b79 100644
> --- a/include/GL/glx.h
> +++ b/include/GL/glx.h
> @@ -371,14 +371,6 @@ extern Bool glXDrawableAttribARB(Display *dpy, GLXDrawable draw, const int *attr
>   /*
>    * Remove this when glxext.h is updated.
>    */
> -#ifndef GLX_NV_float_buffer
> -#define GLX_NV_float_buffer 1
> -
> -#define GLX_FLOAT_COMPONENTS_NV         0x20B0
> -
> -#endif /* GLX_NV_float_buffer */
> -
> -
>
>   /*
>    * #?. GLX_MESA_swap_frame_usage
> @@ -415,86 +407,6 @@ typedef int (*PFNGLXGETSWAPINTERVALMESAPROC)(void);
>   #endif /* GLX_MESA_swap_control */
>
>
> -
> -/*
> - * #?. GLX_EXT_texture_from_pixmap
> - * XXX not finished?
> - */
> -#ifndef GLX_EXT_texture_from_pixmap
> -#define GLX_EXT_texture_from_pixmap 1
> -
> -#define GLX_BIND_TO_TEXTURE_RGB_EXT        0x20D0
> -#define GLX_BIND_TO_TEXTURE_RGBA_EXT       0x20D1
> -#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT     0x20D2
> -#define GLX_BIND_TO_TEXTURE_TARGETS_EXT    0x20D3
> -#define GLX_Y_INVERTED_EXT                 0x20D4
> -
> -#define GLX_TEXTURE_FORMAT_EXT             0x20D5
> -#define GLX_TEXTURE_TARGET_EXT             0x20D6
> -#define GLX_MIPMAP_TEXTURE_EXT             0x20D7
> -
> -#define GLX_TEXTURE_FORMAT_NONE_EXT        0x20D8
> -#define GLX_TEXTURE_FORMAT_RGB_EXT         0x20D9
> -#define GLX_TEXTURE_FORMAT_RGBA_EXT        0x20DA
> -
> -#define GLX_TEXTURE_1D_BIT_EXT             0x00000001
> -#define GLX_TEXTURE_2D_BIT_EXT             0x00000002
> -#define GLX_TEXTURE_RECTANGLE_BIT_EXT      0x00000004
> -
> -#define GLX_TEXTURE_1D_EXT                 0x20DB
> -#define GLX_TEXTURE_2D_EXT                 0x20DC
> -#define GLX_TEXTURE_RECTANGLE_EXT          0x20DD
> -
> -#define GLX_FRONT_LEFT_EXT                 0x20DE
> -#define GLX_FRONT_RIGHT_EXT                0x20DF
> -#define GLX_BACK_LEFT_EXT                  0x20E0
> -#define GLX_BACK_RIGHT_EXT                 0x20E1
> -#define GLX_FRONT_EXT                      GLX_FRONT_LEFT_EXT
> -#define GLX_BACK_EXT                       GLX_BACK_LEFT_EXT
> -#define GLX_AUX0_EXT                       0x20E2
> -#define GLX_AUX1_EXT                       0x20E3
> -#define GLX_AUX2_EXT                       0x20E4
> -#define GLX_AUX3_EXT                       0x20E5
> -#define GLX_AUX4_EXT                       0x20E6
> -#define GLX_AUX5_EXT                       0x20E7
> -#define GLX_AUX6_EXT                       0x20E8
> -#define GLX_AUX7_EXT                       0x20E9
> -#define GLX_AUX8_EXT                       0x20EA
> -#define GLX_AUX9_EXT                       0x20EB
> -
> -extern void glXBindTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer, const int *attrib_list);
> -extern void glXReleaseTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer);
> -
> -#endif /* GLX_EXT_texture_from_pixmap */
> -
> -
> -#ifndef GLX_MESA_query_renderer
> -#define GLX_MESA_query_renderer 1
> -
> -#define GLX_RENDERER_VENDOR_ID_MESA                      0x8183
> -#define GLX_RENDERER_DEVICE_ID_MESA                      0x8184
> -#define GLX_RENDERER_VERSION_MESA                        0x8185
> -#define GLX_RENDERER_ACCELERATED_MESA                    0x8186
> -#define GLX_RENDERER_VIDEO_MEMORY_MESA                   0x8187
> -#define GLX_RENDERER_UNIFIED_MEMORY_ARCHITECTURE_MESA    0x8188
> -#define GLX_RENDERER_PREFERRED_PROFILE_MESA              0x8189
> -#define GLX_RENDERER_OPENGL_CORE_PROFILE_VERSION_MESA    0x818A
> -#define GLX_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION_MESA    0x818B
> -#define GLX_RENDERER_OPENGL_ES_PROFILE_VERSION_MESA      0x818C
> -#define GLX_RENDERER_OPENGL_ES2_PROFILE_VERSION_MESA     0x818D
> -#define GLX_RENDERER_ID_MESA                             0x818E
> -
> -Bool glXQueryRendererIntegerMESA(Display *dpy, int screen, int renderer, int attribute, unsigned int *value);
> -Bool glXQueryCurrentRendererIntegerMESA(int attribute, unsigned int *value);
> -const char *glXQueryRendererStringMESA(Display *dpy, int screen, int renderer, int attribute);
> -const char *glXQueryCurrentRendererStringMESA(int attribute);
> -
> -typedef Bool (*PFNGLXQUERYRENDERERINTEGERMESAPROC) (Display *dpy, int screen, int renderer, int attribute, unsigned int *value);
> -typedef Bool (*PFNGLXQUERYCURRENTRENDERERINTEGERMESAPROC) (int attribute, unsigned int *value);
> -typedef const char *(*PFNGLXQUERYRENDERERSTRINGMESAPROC) (Display *dpy, int screen, int renderer, int attribute);
> -typedef const char *(*PFNGLXQUERYCURRENTRENDERERSTRINGMESAPROC) (int attribute);
> -#endif /* GLX_MESA_query_renderer */
> -
>   /*** Should these go here, or in another header? */
>   /*
>   ** GLX Events
>


Reviewed-by: Brian Paul <brianp at vmware.com>