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-renderer.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-renderer.c')
| -rw-r--r-- | cogl/cogl-renderer.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cogl/cogl-renderer.c b/cogl/cogl-renderer.c index 0ca3edd2..5cc6ed99 100644 --- a/cogl/cogl-renderer.c +++ b/cogl/cogl-renderer.c @@ -32,6 +32,7 @@ #include <string.h> #include "cogl.h" +#include "cogl-util.h" #include "cogl-internal.h" #include "cogl-private.h" #include "cogl-object.h" @@ -133,10 +134,10 @@ void cogl_xlib_renderer_set_foreign_display (CoglRenderer *renderer, Display *xdisplay) { - g_return_if_fail (cogl_is_renderer (renderer)); + _COGL_RETURN_IF_FAIL (cogl_is_renderer (renderer)); /* NB: Renderers are considered immutable once connected */ - g_return_if_fail (!renderer->connected); + _COGL_RETURN_IF_FAIL (!renderer->connected); renderer->foreign_xdpy = xdisplay; } @@ -144,7 +145,7 @@ cogl_xlib_renderer_set_foreign_display (CoglRenderer *renderer, Display * cogl_xlib_renderer_get_foreign_display (CoglRenderer *renderer) { - g_return_val_if_fail (cogl_is_renderer (renderer), NULL); + _COGL_RETURN_VAL_IF_FAIL (cogl_is_renderer (renderer), NULL); return renderer->foreign_xdpy; } @@ -374,7 +375,7 @@ void cogl_renderer_set_winsys_id (CoglRenderer *renderer, CoglWinsysID winsys_id) { - g_return_if_fail (!renderer->connected); + _COGL_RETURN_IF_FAIL (!renderer->connected); renderer->winsys_id_override = winsys_id; } @@ -382,7 +383,7 @@ cogl_renderer_set_winsys_id (CoglRenderer *renderer, CoglWinsysID cogl_renderer_get_winsys_id (CoglRenderer *renderer) { - g_return_val_if_fail (renderer->connected, 0); + _COGL_RETURN_VAL_IF_FAIL (renderer->connected, 0); return renderer->winsys_vtable->id; } |