[mutter] Don't pretend we don't have CoglShader

[Jonas Ådahl <jadahl src gnome org>]

commit eed71654ba6ac810ad835cb5a19624a29a9d18dd
Author: Jonas Ådahl <jadahl gmail com>
Date:   Wed Jun 15 18:51:21 2016 -0400

    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

 clutter/clutter/clutter-shader-effect.c     |    4 ----
 clutter/clutter/deprecated/clutter-shader.c |    4 ----
 cogl/cogl/cogl.h                            |    2 +-
 3 files changed, 1 insertions(+), 9 deletions(-)
---
diff --git a/clutter/clutter/clutter-shader-effect.c b/clutter/clutter/clutter-shader-effect.c
index c6ec49f..ee54485 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 629595e..60f15c6 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"
diff --git a/cogl/cogl/cogl.h b/cogl/cogl/cogl.h
index 5d8c4e2..8856837 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>