summaryrefslogtreecommitdiff
path: root/gst-libs/gst/gl/gstgles2.h
diff options
context:
space:
mode:
authorJulien Isorce <julien.isorce@collabora.co.uk>2014-03-24 12:08:43 +0000
committerJulien Isorce <julien.isorce@collabora.co.uk>2014-04-15 17:40:54 +0100
commitd93ed2b8704f93482b73718493d39fe51f5dfcc7 (patch)
treeb9522836a45de9af75a0bf2af52eded9d31739aa /gst-libs/gst/gl/gstgles2.h
parent6a2e39eefa14ade65008305c7dbc492b9e94d96a (diff)
gl: allow to include GLES/gl.h
https://bugzilla.gnome.org/show_bug.cgi?id=703343
Diffstat (limited to 'gst-libs/gst/gl/gstgles2.h')
-rw-r--r--gst-libs/gst/gl/gstgles2.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/gst-libs/gst/gl/gstgles2.h b/gst-libs/gst/gl/gstgles2.h
index 195ca7d75..54659613e 100644
--- a/gst-libs/gst/gl/gstgles2.h
+++ b/gst-libs/gst/gl/gstgles2.h
@@ -54,8 +54,12 @@ G_BEGIN_DECLS
#define GL_COLOR_ATTACHMENT1 0
#define GL_COLOR_ATTACHMENT2 0
+#ifndef GL_TEXTURE_ENV
#define GL_TEXTURE_ENV 0
+#endif
+#ifndef GL_TEXTURE_ENV_MODE
#define GL_TEXTURE_ENV_MODE 0
+#endif
#define GL_DEPTH24_STENCIL8 0
G_END_DECLS