[Mesa-dev] [PATCH] include: Revert out the update of the Khronos GLX extension header.

Mark Janes mark.a.janes at intel.com
Fri Oct 13 00:22:50 UTC 2017


Tested-by: Mark Janes <mark.a.janes at intel.com>
Reviewed-by: Mark Janes <mark.a.janes at intel.com>

I'd like to get this pushed right away, because Mesa CI is basically
offline due to the subsequent build failures.

Eric Anholt <eric at anholt.net> writes:

> They made a mistake in the MESA_swap_control XML, which I'm pursuing in
> their github.  Until then, we can just back this piece out.
> ---
>  include/GL/glxext.h | 12 +-----------
>  1 file changed, 1 insertion(+), 11 deletions(-)
>
> diff --git a/include/GL/glxext.h b/include/GL/glxext.h
> index 8f6abab2d520..0f60a380c21b 100644
> --- a/include/GL/glxext.h
> +++ b/include/GL/glxext.h
> @@ -34,7 +34,7 @@ extern "C" {
>  **   https://github.com/KhronosGroup/OpenGL-Registry
>  */
>  
> -#define GLX_GLXEXT_VERSION 20170926
> +#define GLX_GLXEXT_VERSION 20170728
>  
>  /* Generated C header for:
>   * API: glx
> @@ -503,16 +503,6 @@ Bool glXSet3DfxModeMESA (int mode);
>  #endif
>  #endif /* GLX_MESA_set_3dfx_mode */
>  
> -#ifndef GLX_MESA_swap_control
> -#define GLX_MESA_swap_control 1
> -typedef int ( *PFNGLXGETSWAPINTERVALMESAPROC) (void);
> -typedef void ( *PFNGLXSWAPINTERVALMESAPROC) (unsigned int interval);
> -#ifdef GLX_GLXEXT_PROTOTYPES
> -int glXGetSwapIntervalMESA (void);
> -void glXSwapIntervalMESA (unsigned int interval);
> -#endif
> -#endif /* GLX_MESA_swap_control */
> -
>  #ifndef GLX_NV_copy_buffer
>  #define GLX_NV_copy_buffer 1
>  typedef void ( *PFNGLXCOPYBUFFERSUBDATANVPROC) (Display *dpy, GLXContext readCtx, GLXContext writeCtx, GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
> -- 
> 2.14.2
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list