[clutter] backend: Do not call ensure_context() with NULL stage
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter] backend: Do not call ensure_context() with NULL stage
- Date: Tue, 14 Jun 2011 16:01:35 +0000 (UTC)
commit 81e9bf6127e96ae20c5add1ee7b6aaf603c72e4e
Author: Emmanuele Bassi <ebassi linux intel com>
Date: Tue Jun 14 15:50:42 2011 +0100
backend: Do not call ensure_context() with NULL stage
Always call ensure_context() if we have a valid Stage.
https://bugzilla.gnome.org/show_bug.cgi?id=652566
clutter/clutter-backend.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c
index f3f7144..73eddcb 100644
--- a/clutter/clutter-backend.c
+++ b/clutter/clutter-backend.c
@@ -478,18 +478,18 @@ _clutter_backend_ensure_context (ClutterBackend *backend,
new_stage);
}
- _clutter_backend_ensure_context_internal (backend, new_stage);
-
/* XXX: Until Cogl becomes fully responsible for backend windows
* Clutter need to manually keep it informed of the current window size
*
* NB: This must be done after we ensure_context above because Cogl
* always assumes there is a current GL context.
*/
- if (new_stage)
+ if (new_stage != NULL)
{
float width, height;
+ _clutter_backend_ensure_context_internal (backend, new_stage);
+
clutter_actor_get_size (CLUTTER_ACTOR (stage), &width, &height);
cogl_onscreen_clutter_backend_set_size (width, height);
@@ -501,7 +501,8 @@ _clutter_backend_ensure_context (ClutterBackend *backend,
* switch between stages.
*
* This dirty mechanism will ensure they are asserted before
- * the next paint... */
+ * the next paint...
+ */
_clutter_stage_dirty_viewport (stage);
_clutter_stage_dirty_projection (stage);
}
@@ -509,7 +510,7 @@ _clutter_backend_ensure_context (ClutterBackend *backend,
/* FIXME: With a NULL stage and thus no active context it may make more
* sense to clean the context but then re call with the default stage
* so at least there is some kind of context in place (as to avoid
- * potential issue of GL calls with no context)
+ * potential issue of GL calls with no context).
*/
current_context_stage = new_stage;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]