brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

debug: Remove CLUTTER_MARK

Browse Source 
The debug macro is seldom used, and it's a bit lame at that.
This commit is contained in:
Emmanuele Bassi 2011-11-18 17:30:39 +00:00
parent ecdb12ecc3
commit 2d76407016
3 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clutter/clutter-debug.h
View File

@ -71,8 +71,6 @@ typedef enum {
} } G_STMT_END } } G_STMT_END
#endif #endif
#define CLUTTER_MARK() CLUTTER_NOTE(MISC, "== mark ==")
#define CLUTTER_GLERR() G_STMT_START { \ #define CLUTTER_GLERR() G_STMT_START { \
if (clutter_debug_flags & CLUTTER_DEBUG_GL) { \ if (clutter_debug_flags & CLUTTER_DEBUG_GL) { \
GLenum _err = glGetError (); /* roundtrip */ \ GLenum _err = glGetError (); /* roundtrip */ \
@ -84,7 +82,6 @@ typedef enum {
#else /* !CLUTTER_ENABLE_DEBUG */ #else /* !CLUTTER_ENABLE_DEBUG */
#define CLUTTER_NOTE(type,...) G_STMT_START { } G_STMT_END #define CLUTTER_NOTE(type,...) G_STMT_START { } G_STMT_END
#define CLUTTER_MARK() G_STMT_START { } G_STMT_END
#define CLUTTER_GLERR() G_STMT_START { } G_STMT_END #define CLUTTER_GLERR() G_STMT_START { } G_STMT_END
#define CLUTTER_HAS_DEBUG(type) FALSE #define CLUTTER_HAS_DEBUG(type) FALSE

4
clutter/clutter-main.c
View File

@ -927,8 +927,6 @@ clutter_main (void)
return; return;
} }
CLUTTER_MARK ();
clutter_main_loop_level++; clutter_main_loop_level++;
#ifdef CLUTTER_ENABLE_PROFILE #ifdef CLUTTER_ENABLE_PROFILE
@ -955,8 +953,6 @@ clutter_main (void)
clutter_main_loop_level--; clutter_main_loop_level--;
CLUTTER_MARK ();
if (clutter_main_loop_level == 0) if (clutter_main_loop_level == 0)
CLUTTER_TIMER_STOP (uprof_get_mainloop_context (), mainloop_timer); CLUTTER_TIMER_STOP (uprof_get_mainloop_context (), mainloop_timer);
} }

8
clutter/clutter-texture.c
View File

@ -220,8 +220,6 @@ texture_free_gl_resources (ClutterTexture *texture)
{ {
ClutterTexturePrivate *priv = texture->priv; ClutterTexturePrivate *priv = texture->priv;
CLUTTER_MARK();
if (priv->material != COGL_INVALID_HANDLE) if (priv->material != COGL_INVALID_HANDLE)
{ {
/* We want to keep the layer so that the filter settings will /* We want to keep the layer so that the filter settings will
@ -243,8 +241,6 @@ clutter_texture_unrealize (ClutterActor *actor)
if (priv->material == COGL_INVALID_HANDLE) if (priv->material == COGL_INVALID_HANDLE)
return; return;
CLUTTER_MARK();
if (priv->fbo_source != NULL) if (priv->fbo_source != NULL)
{ {
/* Free up our fbo handle and texture resources, realize will recreate */ /* Free up our fbo handle and texture resources, realize will recreate */
@ -266,8 +262,6 @@ clutter_texture_realize (ClutterActor *actor)
texture = CLUTTER_TEXTURE(actor); texture = CLUTTER_TEXTURE(actor);
priv = texture->priv; priv = texture->priv;
CLUTTER_MARK();
if (priv->fbo_source) if (priv->fbo_source)
{ {
CoglTextureFlags flags = COGL_TEXTURE_NONE; CoglTextureFlags flags = COGL_TEXTURE_NONE;
@ -2610,8 +2604,6 @@ texture_fbo_free_resources (ClutterTexture *texture)
priv = texture->priv; priv = texture->priv;
CLUTTER_MARK();
if (priv->fbo_source != NULL) if (priv->fbo_source != NULL)
{ {
/* If we parented the texture then unparent it again so that it /* If we parented the texture then unparent it again so that it