diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2016-06-15 18:51:21 -0400 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2016-07-20 14:23:48 +0800 |
| commit | eed71654ba6ac810ad835cb5a19624a29a9d18dd (patch) | |
| tree | b688dd3f51cfc1e11c10df5d8a74f7cae24f4227 /clutter/clutter | |
| parent | 835ded3f02a013c07d97c3548afdda18beb7968c (diff) | |
| download | mutter-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 'clutter/clutter')
| -rw-r--r-- | clutter/clutter/clutter-shader-effect.c | 4 | ||||
| -rw-r--r-- | clutter/clutter/deprecated/clutter-shader.c | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/clutter/clutter/clutter-shader-effect.c b/clutter/clutter/clutter-shader-effect.c index c6ec49f1b..ee54485e3 100644 --- a/clutter/clutter/clutter-shader-effect.c +++ b/clutter/clutter/clutter-shader-effect.c @@ -115,10 +115,6 @@ #include "clutter-build-config.h" #endif -/* XXX: This file depends on the cogl_program_ api with has been - * removed for Cogl 2.0 so we undef COGL_ENABLE_EXPERIMENTAL_2_0_API - * for this file for now */ -#undef COGL_ENABLE_EXPERIMENTAL_2_0_API #include "cogl/cogl.h" #include "clutter-shader-effect.h" diff --git a/clutter/clutter/deprecated/clutter-shader.c b/clutter/clutter/deprecated/clutter-shader.c index 629595e5e..60f15c679 100644 --- a/clutter/clutter/deprecated/clutter-shader.c +++ b/clutter/clutter/deprecated/clutter-shader.c @@ -56,10 +56,6 @@ #include <glib.h> -/* This file depends on the cogl 1.x api which isn't exposed when - * COGL_ENABLE_EXPERIMENTAL_2_0_API is defined... - */ -#undef COGL_ENABLE_EXPERIMENTAL_2_0_API #include <cogl/cogl.h> #include "clutter-shader.h" |