Revert "mesa: Build EGL without X11 headers after interop patchset"
This reverts commit 4e2c9a0435
.
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>
This commit is contained in:
parent
c8d9ed5ea1
commit
0d31bfd71a
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue