diff options
| author | Robert Bragg <robert@linux.intel.com> | 2011-10-13 22:34:30 +0100 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2011-11-01 12:03:02 +0000 |
| commit | b72f255c0ab2ccb914caebaecc7cb7988432b9c0 (patch) | |
| tree | 9fd3c70d20729254384a7629e166c0c40c83521b /cogl/cogl-pipeline-layer.c | |
| parent | fd67ddd56e011b8efa3b7baf66db62c81f87171b (diff) | |
| download | cogl-b72f255c0ab2ccb914caebaecc7cb7988432b9c0.tar.gz | |
Start to reduce dependence on glib
Since we've had several developers from admirable projects say they
would like to use Cogl but would really prefer not to pull in
gobject,gmodule and glib as extra dependencies we are investigating if
we can get to the point where glib is only an optional dependency.
Actually we feel like we only make minimal use of glib anyway, so it may
well be quite straightforward to achieve this.
This adds a --disable-glib configure option that can be used to disable
features that depend on glib.
Actually --disable-glib doesn't strictly disable glib at this point
because it's more helpful if cogl continues to build as we make
incremental progress towards this.
The first use of glib that this patch tackles is the use of
g_return_val_if_fail and g_return_if_fail which have been replaced with
equivalent _COGL_RETURN_VAL_IF_FAIL and _COGL_RETURN_IF_FAIL macros.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Diffstat (limited to 'cogl/cogl-pipeline-layer.c')
| -rw-r--r-- | cogl/cogl-pipeline-layer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cogl/cogl-pipeline-layer.c b/cogl/cogl-pipeline-layer.c index 1e71a065..0b5693fe 100644 --- a/cogl/cogl-pipeline-layer.c +++ b/cogl/cogl-pipeline-layer.c @@ -29,6 +29,7 @@ #include "config.h" #endif +#include "cogl-util.h" #include "cogl-context-private.h" #include "cogl-texture-private.h" @@ -235,7 +236,7 @@ _cogl_pipeline_layer_pre_change_notify (CoglPipeline *required_owner, goto init_layer_state; /* We only allow a NULL required_owner for new layers */ - g_return_val_if_fail (required_owner != NULL, layer); + _COGL_RETURN_VAL_IF_FAIL (required_owner != NULL, layer); /* Chain up: * A modification of a layer is indirectly also a modification of |