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

context: Enable new feature testing on COGL_ENABLE_EXPERIMENTAL_API

Browse Source 
The 2.0 API for querying features (cogl_has_feature etc) does not
conflict with the old 1.0 API (cogl_features_available) so we might as
well enable it when the experimental API is requested without
requesting the 2.0-only API.

Reviewed-by: Robert Bragg <robert@linux.intel.com>
This commit is contained in:
Neil Roberts 2012-03-12 17:06:46 +00:00
parent 6f59993e1b
commit de5d55ae93
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cogl/cogl-context.h
View File

@ -158,7 +158,7 @@ cogl_is_context (void *object);
#endif /* COGL_ENABLE_EXPERIMENTAL_2_0_API */ #endif /* COGL_ENABLE_EXPERIMENTAL_2_0_API */
/* XXX: not guarded by the EXPERIMENTAL_2_0_API defines to avoid /* XXX: not guarded by the EXPERIMENTAL_API defines to avoid
* upsetting glib-mkenums, but this can still be considered implicitly * upsetting glib-mkenums, but this can still be considered implicitly
* experimental since it's only useable with experimental API... */ * experimental since it's only useable with experimental API... */
/** /**
@ -236,7 +236,7 @@ typedef enum _CoglFeatureID
} CoglFeatureID; } CoglFeatureID;
#ifdef COGL_ENABLE_EXPERIMENTAL_2_0_API #ifdef COGL_ENABLE_EXPERIMENTAL_API
/** /**
* cogl_has_feature: * cogl_has_feature:
@ -309,7 +309,7 @@ cogl_foreach_feature (CoglContext *context,
CoglFeatureCallback callback, CoglFeatureCallback callback,
void *user_data); void *user_data);
#endif /* COGL_ENABLE_EXPERIMENTAL_2_0_API */ #endif /* COGL_ENABLE_EXPERIMENTAL_API */
G_END_DECLS G_END_DECLS