summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2016-05-03 12:25:34 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2016-05-24 23:03:00 +0100
commit8472045b16b3e4621553fe451a20a9ba9f0d44b6 (patch)
treeea41dc20c35022d24cdf067426fdfba3690f8ef9 /include
parentb5f9820d905a275bc01bbffa9b4927ec11286f8d (diff)
downloadexternal_mesa3d-8472045b16b3e4621553fe451a20a9ba9f0d44b6.zip
external_mesa3d-8472045b16b3e4621553fe451a20a9ba9f0d44b6.tar.gz
external_mesa3d-8472045b16b3e4621553fe451a20a9ba9f0d44b6.tar.bz2
mesa_glinterop: remove inclusion of GLX header
Since we only need partial information about the GLX symbols we can forward declare them and drop the include. Obviously each user of the said API will needs more than what's provides, so they'll include the GLX header. If they don't, the compiler will give us a nice warning ;-) Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Tested-by: Tom Stellard <thomas.stellard@amd.com>
Diffstat (limited to 'include')
-rw-r--r--include/GL/mesa_glinterop.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/GL/mesa_glinterop.h b/include/GL/mesa_glinterop.h
index ae71fea..b76bd7e 100644
--- a/include/GL/mesa_glinterop.h
+++ b/include/GL/mesa_glinterop.h
@@ -51,13 +51,16 @@
#define MESA_GLINTEROP_H
#include <stddef.h>
-#include <GL/glx.h>
#include <EGL/egl.h>
#ifdef __cplusplus
extern "C" {
#endif
+/* Forward declarations to avoid inclusion of GL/glx.h */
+typedef struct _XDisplay Display;
+typedef struct __GLXcontextRec *GLXContext;
+
/** Returned error codes. */
enum {
MESA_GLINTEROP_SUCCESS = 0,