[Mesa-dev] [PATCH 3/3] glx: make interop ABI visible again

[Alex Deucher]

On Wed, Nov 2, 2016 at 2:07 PM, Marek Olšák <maraeo at gmail.com> wrote:
> From: Marek Olšák <marek.olsak at amd.com>
>
> This was broken when the GLAPI use was removed from mesa_glinterop.h.
>
> Cc: 12.0 13.0 <mesa-stable at lists.freedesktop.org>

Series is:
Acked-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  src/glx/glxcmds.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
> index 6abe0b9..8980de3 100644
> --- a/src/glx/glxcmds.c
> +++ b/src/glx/glxcmds.c
> @@ -2706,21 +2706,21 @@ __glXGetUST(int64_t * ust)
>        return 0;
>     }
>     else {
>        return -errno;
>     }
>  }
>  #endif /* GLX_DIRECT_RENDERING */
>
>  #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
>
> -int
> +PUBLIC int
>  MesaGLInteropGLXQueryDeviceInfo(Display *dpy, GLXContext context,
>                                  struct mesa_glinterop_device_info *out)
>  {
>     struct glx_context *gc = (struct glx_context*)context;
>     int ret;
>
>     __glXLock();
>
>     if (!gc || gc->xid == None || !gc->isDirect) {
>        __glXUnlock();
> @@ -2730,21 +2730,21 @@ MesaGLInteropGLXQueryDeviceInfo(Display *dpy, GLXContext context,
>     if (!gc->vtable->interop_query_device_info) {
>        __glXUnlock();
>        return MESA_GLINTEROP_UNSUPPORTED;
>     }
>
>     ret = gc->vtable->interop_query_device_info(gc, out);
>     __glXUnlock();
>     return ret;
>  }
>
> -int
> +PUBLIC int
>  MesaGLInteropGLXExportObject(Display *dpy, GLXContext context,
>                               struct mesa_glinterop_export_in *in,
>                               struct mesa_glinterop_export_out *out)
>  {
>     struct glx_context *gc = (struct glx_context*)context;
>     int ret;
>
>     __glXLock();
>
>     if (!gc || gc->xid == None || !gc->isDirect) {
> --
> 2.7.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev