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

2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com>

Browse Source 
Bug 1211 - Drop ClutterFeatureFlags usage from COGL

	* clutter/cogl/cogl.h.in:
	* clutter/cogl/gl/cogl.c:
	* clutter/cogl/gles/cogl.c: Do not use ClutterFeatureFlags
	when CoglFeatureFlags will do. This removes the last usage
	of Clutter API inside COGL.
This commit is contained in:
Emmanuele Bassi 2008-10-30 16:52:56 +00:00
parent d1f6dbaa79
commit f26827c7d1
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cogl.h.in
View File

@ -43,7 +43,6 @@
#define __COGL_H__
#include <glib.h>
#include <clutter/clutter-feature.h>
#include <cogl/cogl-defines-@CLUTTER_COGL@.h>
#include <cogl/cogl-fixed.h>
@ -176,7 +175,6 @@ typedef enum
COGL_FEATURE_OFFSCREEN_BLIT = (1 << 8),
COGL_FEATURE_FOUR_CLIP_PLANES = (1 << 9),
COGL_FEATURE_STENCIL_BUFFER = (1 << 10)
} CoglFeatureFlags;
/**
@ -274,7 +272,7 @@ typedef void (* CoglFuncPtr) (void);
*
* Since: 0.8
*/
ClutterFeatureFlags cogl_get_features (void);
CoglFeatureFlags cogl_get_features (void);
/**
* cogl_features_available:

8
gl/cogl.c
View File

@ -939,9 +939,9 @@ really_enable_npot (void)
static void
_cogl_features_init ()
{
ClutterFeatureFlags flags = 0;
const gchar *gl_extensions;
GLint max_clip_planes = 0;
CoglFeatureFlags flags = 0;
const gchar *gl_extensions;
GLint max_clip_planes = 0;
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
@ -1121,7 +1121,7 @@ _cogl_features_init ()
ctx->features_cached = TRUE;
}
ClutterFeatureFlags
CoglFeatureFlags
cogl_get_features ()
{
_COGL_GET_CONTEXT (ctx, 0);

6
gles/cogl.c
View File

@ -816,8 +816,8 @@ cogl_setup_viewport (guint w,
static void
_cogl_features_init ()
{
ClutterFeatureFlags flags = 0;
int max_clip_planes = 0;
CoglFeatureFlags flags = 0;
int max_clip_planes = 0;
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
@ -838,7 +838,7 @@ _cogl_features_init ()
ctx->features_cached = TRUE;
}
ClutterFeatureFlags
CoglFeatureFlags
cogl_get_features ()
{
_COGL_GET_CONTEXT (ctx, 0);