diff options
| author | Youry Metlitsky <winaes@narod.ru> | 2016-04-27 22:33:14 +0000 |
|---|---|---|
| committer | Mark Janes <mark.a.janes@intel.com> | 2016-05-20 08:44:18 -0700 |
| commit | 4e2c9a04354b6b133845b8b93c0c5d34261a91d0 (patch) | |
| tree | 0ef065ee00012fe2ccb26f0a92f5fa220bb56ca6 | |
| parent | df361fc58cb1aaf8c692c3aa6f545cf7f495b374 (diff) | |
| download | external_mesa3d-4e2c9a04354b6b133845b8b93c0c5d34261a91d0.zip external_mesa3d-4e2c9a04354b6b133845b8b93c0c5d34261a91d0.tar.gz external_mesa3d-4e2c9a04354b6b133845b8b93c0c5d34261a91d0.tar.bz2 | |
mesa: Build EGL without X11 headers after interop patchset
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
| -rw-r--r-- | include/GL/mesa_glinterop.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/include/GL/mesa_glinterop.h b/include/GL/mesa_glinterop.h index 814064d..39822f2 100644 --- a/include/GL/mesa_glinterop.h +++ b/include/GL/mesa_glinterop.h @@ -50,7 +50,11 @@ #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 @@ -219,6 +223,7 @@ typedef struct _mesa_glinterop_export_out { } mesa_glinterop_export_out; +#if !defined(MESA_EGL_NO_X11_HEADERS) /** * Query device information. * @@ -228,9 +233,11 @@ 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 /** @@ -242,6 +249,7 @@ 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. @@ -253,10 +261,12 @@ 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 /** @@ -268,14 +278,17 @@ 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); |