On Tue, May 24, 2016 at 03:32:44PM +0100, Emil Velikov wrote: > From: Emil Velikov <emil.veli...@collabora.com> > > This reverts commit 4e2c9a04354b6b133845b8b93c0c5d34261a91d0. > > The solution was incomplete and fragile. An alternative one is coming > shortly.
Tested-by: Tom Stellard <thomas.stell...@amd.com> > --- > include/GL/mesa_glinterop.h | 15 +-------------- > 1 file changed, 1 insertion(+), 14 deletions(-) > > diff --git a/include/GL/mesa_glinterop.h b/include/GL/mesa_glinterop.h > index 39822f2..814064d 100644 > --- a/include/GL/mesa_glinterop.h > +++ b/include/GL/mesa_glinterop.h > @@ -50,11 +50,7 @@ > #ifndef MESA_GLINTEROP_H > #define MESA_GLINTEROP_H > > -#if defined(MESA_EGL_NO_X11_HEADERS) > -#include <GL/gl.h> > -#else > #include <GL/glx.h> > -#endif > #include <EGL/egl.h> > > #ifdef __cplusplus > @@ -223,7 +219,6 @@ typedef struct _mesa_glinterop_export_out { > } mesa_glinterop_export_out; > > > -#if !defined(MESA_EGL_NO_X11_HEADERS) > /** > * Query device information. > * > @@ -233,11 +228,9 @@ typedef struct _mesa_glinterop_export_out { > * > * \return MESA_GLINTEROP_SUCCESS or MESA_GLINTEROP_* != 0 on error > */ > - > GLAPI int GLAPIENTRY > MesaGLInteropGLXQueryDeviceInfo(Display *dpy, GLXContext context, > mesa_glinterop_device_info *out); > -#endif > > > /** > @@ -249,7 +242,6 @@ MesaGLInteropEGLQueryDeviceInfo(EGLDisplay dpy, > EGLContext context, > mesa_glinterop_device_info *out); > > > -#if !defined(MESA_EGL_NO_X11_HEADERS) > /** > * Create and return a DMABUF handle corresponding to the given OpenGL > * object, and return other parameters about the OpenGL object. > @@ -261,12 +253,10 @@ MesaGLInteropEGLQueryDeviceInfo(EGLDisplay dpy, > EGLContext context, > * > * \return MESA_GLINTEROP_SUCCESS or MESA_GLINTEROP_* != 0 on error > */ > - > GLAPI int GLAPIENTRY > MesaGLInteropGLXExportObject(Display *dpy, GLXContext context, > const mesa_glinterop_export_in *in, > mesa_glinterop_export_out *out); > -#endif > > > /** > @@ -278,17 +268,14 @@ MesaGLInteropEGLExportObject(EGLDisplay dpy, EGLContext > context, > const mesa_glinterop_export_in *in, > mesa_glinterop_export_out *out); > > -#if !defined(MESA_EGL_NO_X11_HEADERS) > + > typedef int (APIENTRYP PFNMESAGLINTEROPGLXQUERYDEVICEINFOPROC)(Display *dpy, > GLXContext context, > > mesa_glinterop_device_info *out); > -#endif > typedef int (APIENTRYP PFNMESAGLINTEROPEGLQUERYDEVICEINFOPROC)(EGLDisplay > dpy, EGLContext context, > > mesa_glinterop_device_info *out); > -#if !defined(MESA_EGL_NO_X11_HEADERS) > typedef int (APIENTRYP PFNMESAGLINTEROPGLXEXPORTOBJECTPROC)(Display *dpy, > GLXContext context, > const > mesa_glinterop_export_in *in, > > mesa_glinterop_export_out *out); > -#endif > typedef int (APIENTRYP PFNMESAGLINTEROPEGLEXPORTOBJECTPROC)(EGLDisplay dpy, > EGLContext context, > const > mesa_glinterop_export_in *in, > > mesa_glinterop_export_out *out); > -- > 2.8.2 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev