diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2016-05-24 14:21:31 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-05-24 23:02:05 +0100 |
| commit | 0d31bfd71aa44aa34f3cfa8711c4070c3fb1e26a (patch) | |
| tree | a991ea1799ca3d9fad06147c5dde5faf3cf9e9b5 | |
| parent | c8d9ed5ea163beae583fc20762a81c778442414a (diff) | |
| download | external_mesa3d-0d31bfd71aa44aa34f3cfa8711c4070c3fb1e26a.zip external_mesa3d-0d31bfd71aa44aa34f3cfa8711c4070c3fb1e26a.tar.gz external_mesa3d-0d31bfd71aa44aa34f3cfa8711c4070c3fb1e26a.tar.bz2 | |
Revert "mesa: Build EGL without X11 headers after interop patchset"
This reverts commit 4e2c9a04354b6b133845b8b93c0c5d34261a91d0.
The solution was incomplete and fragile. An alternative one is coming
shortly.
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Tested-by: Tom Stellard <thomas.stellard@amd.com>
| -rw-r--r-- | include/GL/mesa_glinterop.h | 15 |
1 files changed, 1 insertions, 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); |