isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't pretend we don't have CoglShader

Browse Source 
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
This commit is contained in:
Jonas Ådahl 2016-06-15 18:51:21 -04:00
parent 835ded3f02
commit eed71654ba
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clutter/clutter/clutter-shader-effect.c
View File

@ -115,10 +115,6 @@
#include "clutter-build-config.h" #include "clutter-build-config.h"
#endif #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 "cogl/cogl.h"
#include "clutter-shader-effect.h" #include "clutter-shader-effect.h"

4
clutter/clutter/deprecated/clutter-shader.c
View File

@ -56,10 +56,6 @@
#include <glib.h> #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 <cogl/cogl.h>
#include "clutter-shader.h" #include "clutter-shader.h"

2
cogl/cogl/cogl.h
View File

@ -82,7 +82,6 @@
#include <cogl/cogl-enum-types.h> #include <cogl/cogl-enum-types.h>
#include <cogl/deprecated/cogl-vertex-buffer.h> #include <cogl/deprecated/cogl-vertex-buffer.h>
#include <cogl/deprecated/cogl-material-compat.h> #include <cogl/deprecated/cogl-material-compat.h>
#include <cogl/deprecated/cogl-shader.h>
#endif #endif
/* It would be good to move these casts up into 1.x only api if we can /* 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-framebuffer-deprecated.h>
#include <cogl/deprecated/cogl-auto-texture.h> #include <cogl/deprecated/cogl-auto-texture.h>
#include <cogl/deprecated/cogl-shader.h>
#ifdef COGL_ENABLE_MUTTER_API #ifdef COGL_ENABLE_MUTTER_API
#include <cogl/cogl-mutter.h> #include <cogl/cogl-mutter.h>