From d2763fd8a4e60eb3aa8e4ad43809460f448fdf51 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Fri, 22 Jul 2011 12:28:29 +0100 Subject: [PATCH] stage-cogl: pass top-left relative swap_region coords All 2D coordinate spaces in Cogl have their origin at the top-left so we shouldn't be flipping the coordinates we pass to cogl_framebuffer_swap_region to be relative to the bottom of the framebuffer. This bumps the Cogl version requirement to 1.7.5 since we've had to fix a bug in the semantics of cogl_framebuffer_swap_region. Reviewed-by: Neil Roberts --- clutter/cogl/clutter-stage-cogl.c | 4 +--- configure.ac | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/clutter/cogl/clutter-stage-cogl.c b/clutter/cogl/clutter-stage-cogl.c index 3f3704d86..40416f3f4 100644 --- a/clutter/cogl/clutter-stage-cogl.c +++ b/clutter/cogl/clutter-stage-cogl.c @@ -503,7 +503,6 @@ clutter_stage_cogl_redraw (ClutterStageWindow *stage_window) { ClutterGeometry *clip = &stage_cogl->bounding_redraw_clip; int copy_area[4]; - ClutterActor *actor; /* XXX: It seems there will be a race here in that the stage * window may be resized before the cogl_framebuffer_swap_region @@ -514,9 +513,8 @@ clutter_stage_cogl_redraw (ClutterStageWindow *stage_window) * artefacts. */ - actor = CLUTTER_ACTOR (wrapper); copy_area[0] = clip->x; - copy_area[1] = clutter_actor_get_height (actor) - clip->y - clip->height; + copy_area[1] = clip->y; copy_area[2] = clip->width; copy_area[3] = clip->height; diff --git a/configure.ac b/configure.ac index d4dd77c4a..628f5f3f3 100644 --- a/configure.ac +++ b/configure.ac @@ -114,7 +114,7 @@ AC_HEADER_STDC # required versions for dependencies m4_define([glib_req_version], [2.26.0]) -m4_define([cogl_req_version], [1.7.3]) +m4_define([cogl_req_version], [1.7.5]) m4_define([json_glib_req_version], [0.12.0]) m4_define([atk_req_version], [1.17]) m4_define([cairo_req_version], [1.10])