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

Merged clutter-ivan branch into trunk.

Browse Source 
svn merge \
 https://svn.o-hand.com/repos/clutter/trunk/clutter@2509 \
 https://svn.o-hand.com/repos/clutter/branches/clutter-ivan@HEAD
This commit is contained in:
Neil Roberts
2008-04-25 13:37:36 +00:00
parent 7c3cf35eec
commit 6409b1adeb
123 changed files with 20528 additions and 3377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
clutter/clutter-feature.c
View File

@ -43,7 +43,7 @@
#include "clutter-private.h"
#include "clutter-debug.h"
#include "cogl.h"
#include "cogl/cogl.h"
typedef struct ClutterFeatures
{
@ -53,6 +53,32 @@ typedef struct ClutterFeatures
static ClutterFeatures* __features = NULL;
ClutterFeatureFlags
_clutter_features_from_cogl (guint cogl_flags)
{
ClutterFeatureFlags clutter_flags = 0;
if (cogl_flags & COGL_FEATURE_TEXTURE_RECTANGLE)
clutter_flags |= CLUTTER_FEATURE_TEXTURE_RECTANGLE;
if (cogl_flags & COGL_FEATURE_TEXTURE_NPOT)
clutter_flags |= CLUTTER_FEATURE_TEXTURE_NPOT;
if (cogl_flags & COGL_FEATURE_TEXTURE_YUV)
clutter_flags |= CLUTTER_FEATURE_TEXTURE_YUV;
if (cogl_flags & COGL_FEATURE_TEXTURE_READ_PIXELS)
clutter_flags |= CLUTTER_FEATURE_TEXTURE_READ_PIXELS;
if (cogl_flags & COGL_FEATURE_SHADERS_GLSL)
clutter_flags |= CLUTTER_FEATURE_SHADERS_GLSL;
if (cogl_flags & COGL_FEATURE_OFFSCREEN)
clutter_flags |= CLUTTER_FEATURE_OFFSCREEN;
return clutter_flags;
}
void
_clutter_feature_init (void)
{
@ -72,8 +98,8 @@ _clutter_feature_init (void)
context = clutter_context_get_default ();
__features->flags = cogl_get_features()
|_clutter_backend_get_features (context->backend);
__features->flags = (_clutter_features_from_cogl (cogl_get_features ())
| _clutter_backend_get_features (context->backend));
__features->features_set = TRUE;