> On Dec 5, 2016, at 11:52 AM, Emil Velikov <emil.l.veli...@gmail.com> wrote:
>
> From: Emil Velikov <emil.veli...@collabora.com>
>
> No point in having an identical code in two places.
>
> Not to mention that the Apple one incorrectly uses GLXDrawable as pbuf
> type. This change is both API and ABI safe since the header uses the
> correct GLXPbufferSGIX and both types are a typedef of the same
> primitive XID.
>
> Cc: Jeremy Huddleston Sequoia <jerem...@apple.com>
> Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Jeremy Sequoia <jerem...@apple.com>
(not tested yet, though)
> ---
> Jeremy, humble poke to send any/all Macports patches to the list ;-)
What patches are you referring to? AFAIK, all the patches we have in MacPorts
are hacks that have been rejected by mesa or are things I don't think should be
in mesa due to lack of polish/hack status. See:
https://github.com/macports/macports-ports/tree/master/x11/mesa/files
> ---
> src/glx/apple/glx_empty.c | 16 ----------------
> src/glx/glx_pbuffer.c | 2 --
> 2 files changed, 18 deletions(-)
>
> diff --git a/src/glx/apple/glx_empty.c b/src/glx/apple/glx_empty.c
> index 1e9593c..33fffb5 100644
> --- a/src/glx/apple/glx_empty.c
> +++ b/src/glx/apple/glx_empty.c
> @@ -263,19 +263,3 @@ glXGetFBConfigFromVisualSGIX(Display * dpy, XVisualInfo
> * visinfo)
> return NULL;
> }
> #endif
> -
> -
> -_X_EXPORT
> -GLX_ALIAS_VOID(glXDestroyGLXPbufferSGIX,
> - (Display * dpy, GLXDrawable pbuf),
> - (dpy, pbuf), glXDestroyPbuffer)
> -
> - _X_EXPORT GLX_ALIAS_VOID(glXSelectEventSGIX,
> - (Display * dpy, GLXDrawable drawable,
> - unsigned long mask), (dpy, drawable, mask),
> - glXSelectEvent)
> -
> - _X_EXPORT GLX_ALIAS_VOID(glXGetSelectedEventSGIX,
> - (Display * dpy, GLXDrawable drawable,
> - unsigned long *mask), (dpy, drawable, mask),
> - glXGetSelectedEvent)
> diff --git a/src/glx/glx_pbuffer.c b/src/glx/glx_pbuffer.c
> index 24c073c..0c15d2a 100644
> --- a/src/glx/glx_pbuffer.c
> +++ b/src/glx/glx_pbuffer.c
> @@ -992,7 +992,6 @@ glXDestroyWindow(Display * dpy, GLXWindow win)
> #endif
> }
>
> -#ifndef GLX_USE_APPLEGL
> _GLX_PUBLIC
> GLX_ALIAS_VOID(glXDestroyGLXPbufferSGIX,
> (Display * dpy, GLXPbufferSGIX pbuf),
> @@ -1008,4 +1007,3 @@ GLX_ALIAS_VOID(glXGetSelectedEventSGIX,
> (Display * dpy, GLXDrawable drawable,
> unsigned long *mask), (dpy, drawable, mask),
> glXGetSelectedEvent)
> -#endif
> --
> 2.10.2
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
