brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta-window-group: Use clutter_stage_get_redraw_clip_bounds

Browse Source 
Clutter now has some API to get the bounds of the current redraw clip
so Mutter no longer needs to make direct GL calls to get the scissor
rect. This should make it more robust against Cogl or Clutter changing
how it does the clipping.

https://bugzilla.gnome.org/show_bug.cgi?id=654551
This commit is contained in:
Neil Roberts 2011-07-13 14:01:05 +01:00
parent cd7a968093
commit 4167ef870c
2 changed files with 13 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -185,7 +185,7 @@ else
AC_MSG_ERROR([no. Mutter requires the Xcomposite extension to build.]) AC_MSG_ERROR([no. Mutter requires the Xcomposite extension to build.])
fi fi
CLUTTER_VERSION=1.2.0 CLUTTER_VERSION=1.7.5
CLUTTER_PACKAGE=clutter-1.0 CLUTTER_PACKAGE=clutter-1.0
AC_SUBST(CLUTTER_PACKAGE) AC_SUBST(CLUTTER_PACKAGE)
if $PKG_CONFIG --atleast-version $CLUTTER_VERSION $CLUTTER_PACKAGE ; then if $PKG_CONFIG --atleast-version $CLUTTER_VERSION $CLUTTER_PACKAGE ; then

48
src/compositor/meta-window-group.c
View File

@ -103,11 +103,9 @@ actor_is_untransformed (ClutterActor *actor,
static void static void
meta_window_group_paint (ClutterActor *actor) meta_window_group_paint (ClutterActor *actor)
{ {
MetaWindowGroup *window_group = META_WINDOW_GROUP (actor);
cairo_region_t *visible_region; cairo_region_t *visible_region;
GLboolean scissor_test; ClutterActor *stage;
cairo_rectangle_int_t screen_rect = { 0 }; cairo_rectangle_int_t visible_rect;
cairo_rectangle_int_t scissor_rect;
GList *children, *l; GList *children, *l;
/* We walk the list from top to bottom (opposite of painting order), /* We walk the list from top to bottom (opposite of painting order),
@ -117,39 +115,17 @@ meta_window_group_paint (ClutterActor *actor)
children = clutter_container_get_children (CLUTTER_CONTAINER (actor)); children = clutter_container_get_children (CLUTTER_CONTAINER (actor));
children = g_list_reverse (children); children = g_list_reverse (children);
/* Start off with the full screen area (for a multihead setup, we /* Get the clipped redraw bounds from Clutter so that we can avoid
* might want to use a more accurate union of the monitors to avoid * painting shadows on windows that don't need to be painted in this
* painting in holes from mismatched monitor sizes. That's just an * frame. In the case of a multihead setup with mismatched monitor
* optimization, however.) * sizes, we could intersect this with an accurate union of the
*/ * monitors to avoid painting shadows that are visible only in the
meta_screen_get_size (window_group->screen, &screen_rect.width, &screen_rect.height); * holes. */
stage = clutter_actor_get_stage (actor);
clutter_stage_get_redraw_clip_bounds (CLUTTER_STAGE (stage),
&visible_rect);
/* When doing a partial stage paint, Clutter will set the GL scissor visible_region = cairo_region_create_rectangle (&visible_rect);
* box to the clip rectangle for the partial repaint. We combine the screen
* rectangle with the scissor box to get the region we need to
* paint. (Strangely, the scissor box sometimes seems to be bigger
* than the stage ... Clutter should probably be clampimg)
*/
glGetBooleanv (GL_SCISSOR_TEST, &scissor_test);
if (scissor_test)
{
GLint scissor_box[4];
glGetIntegerv (GL_SCISSOR_BOX, scissor_box);
scissor_rect.x = scissor_box[0];
scissor_rect.y = screen_rect.height - (scissor_box[1] + scissor_box[3]);
scissor_rect.width = scissor_box[2];
scissor_rect.height = scissor_box[3];
gdk_rectangle_intersect (&scissor_rect, &screen_rect, &scissor_rect);
}
else
{
scissor_rect = screen_rect;
}
visible_region = cairo_region_create_rectangle (&scissor_rect);
for (l = children; l; l = l->next) for (l = children; l; l = l->next)
{ {