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

2006-07-27 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* clutter/clutter-feature.c: No need to call clutter_feature_init()
	each time: it's private and should never be seen from the outside;
	add a warning, just in case something screws up and calls it more
	than once.
This commit is contained in:
Emmanuele Bassi 2006-07-27 17:10:33 +00:00
parent ad29f37780
commit 3146bdbf16
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2006-07-27 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-feature.c: No need to call clutter_feature_init()
each time: it's private and should never be seen from the outside;
add a warning, just in case something screws up and calls it more
than once.
2006-07-27 Emmanuele Bassi <ebassi@openedhand.com> 2006-07-27 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-private.h: Move clutter_feature_init() * clutter/clutter-private.h: Move clutter_feature_init()

24
clutter/clutter-feature.c
View File

@ -34,8 +34,7 @@
#include "clutter-feature.h" #include "clutter-feature.h"
#include "string.h" #include "string.h"
G_LOCK_DEFINE_STATIC (__features); static ClutterFeatureFlags __features = -1;
static ClutterFeatureFlags __features;
/* Note must be called after context created */ /* Note must be called after context created */
static gboolean static gboolean
@ -66,12 +65,15 @@ check_gl_extension (const gchar *name)
return FALSE; return FALSE;
} }
/* HOLDS: __features lock */ void
static void clutter_feature_init (void)
clutter_feature_init_do (void)
{ {
if (__features) if (__features != -1)
{
g_warning ("You should never call clutter_feature_init() "
"more than once.");
return; return;
}
__features = 0; __features = 0;
@ -79,14 +81,6 @@ clutter_feature_init_do (void)
__features |= CLUTTER_FEATURE_TEXTURE_RECTANGLE; __features |= CLUTTER_FEATURE_TEXTURE_RECTANGLE;
} }
void
clutter_feature_init (void)
{
G_LOCK (__features);
clutter_feature_init_do ();
G_UNLOCK (__features);
}
/** /**
* clutter_feature_available: * clutter_feature_available:
* @feature: a #ClutterFeatureFlags * @feature: a #ClutterFeatureFlags
@ -101,7 +95,6 @@ clutter_feature_init (void)
gboolean gboolean
clutter_feature_available (ClutterFeatureFlags feature) clutter_feature_available (ClutterFeatureFlags feature)
{ {
clutter_feature_init ();
return (__features & feature); return (__features & feature);
} }
@ -117,6 +110,5 @@ clutter_feature_available (ClutterFeatureFlags feature)
ClutterFeatureFlags ClutterFeatureFlags
clutter_feature_all (void) clutter_feature_all (void)
{ {
clutter_feature_init ();
return __features; return __features;
} }