summaryrefslogtreecommitdiff
path: root/cogl
diff options
context:
space:
mode:
authorJonas Ådahl <jadahl@gmail.com>2016-06-15 18:51:21 -0400
committerJonas Ådahl <jadahl@gmail.com>2016-07-20 14:23:48 +0800
commiteed71654ba6ac810ad835cb5a19624a29a9d18dd (patch)
treeb688dd3f51cfc1e11c10df5d8a74f7cae24f4227 /cogl
parent835ded3f02a013c07d97c3548afdda18beb7968c (diff)
downloadmutter-eed71654ba6ac810ad835cb5a19624a29a9d18dd.tar.gz
Don't pretend we don't have CoglShader
We bypass our build configuration to fetch API from a version which isn't the one we actually use. Stop bypassing and just admit that the 1.0 API is still there, but still deprecated. https://bugzilla.gnome.org/show_bug.cgi?id=768977
Diffstat (limited to 'cogl')
-rw-r--r--cogl/cogl/cogl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cogl/cogl/cogl.h b/cogl/cogl/cogl.h
index 5d8c4e21a..885683753 100644
--- a/cogl/cogl/cogl.h
+++ b/cogl/cogl/cogl.h
@@ -82,7 +82,6 @@
#include <cogl/cogl-enum-types.h>
#include <cogl/deprecated/cogl-vertex-buffer.h>
#include <cogl/deprecated/cogl-material-compat.h>
-#include <cogl/deprecated/cogl-shader.h>
#endif
/* It would be good to move these casts up into 1.x only api if we can
@@ -92,6 +91,7 @@
#include <cogl/deprecated/cogl-framebuffer-deprecated.h>
#include <cogl/deprecated/cogl-auto-texture.h>
+#include <cogl/deprecated/cogl-shader.h>
#ifdef COGL_ENABLE_MUTTER_API
#include <cogl/cogl-mutter.h>