[cogl] context: Enable new feature testing on COGL_ENABLE_EXPERIMENTAL_API
- From: Neil Roberts <nroberts src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl] context: Enable new feature testing on COGL_ENABLE_EXPERIMENTAL_API
- Date: Wed, 14 Mar 2012 13:50:03 +0000 (UTC)
commit de5d55ae93d98d89a97138ab785db0c6d8601959
Author: Neil Roberts <neil linux intel com>
Date: Mon Mar 12 17:06:46 2012 +0000
context: Enable new feature testing on COGL_ENABLE_EXPERIMENTAL_API
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>
cogl/cogl-context.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/cogl/cogl-context.h b/cogl/cogl-context.h
index 25c4f0f..e2120d7 100644
--- a/cogl/cogl-context.h
+++ b/cogl/cogl-context.h
@@ -158,7 +158,7 @@ cogl_is_context (void *object);
#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
* experimental since it's only useable with experimental API... */
/**
@@ -236,7 +236,7 @@ typedef enum _CoglFeatureID
} CoglFeatureID;
-#ifdef COGL_ENABLE_EXPERIMENTAL_2_0_API
+#ifdef COGL_ENABLE_EXPERIMENTAL_API
/**
* cogl_has_feature:
@@ -309,7 +309,7 @@ cogl_foreach_feature (CoglContext *context,
CoglFeatureCallback callback,
void *user_data);
-#endif /* COGL_ENABLE_EXPERIMENTAL_2_0_API */
+#endif /* COGL_ENABLE_EXPERIMENTAL_API */
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]