[mutter] clutter/stage-cogl: Only construct damage array if it'll be used
- From: verdre <jonasd src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] clutter/stage-cogl: Only construct damage array if it'll be used
- Date: Tue, 26 May 2020 14:22:06 +0000 (UTC)
commit 9e340287421bea690c9ef9606e7c121c7368e446
Author: Jonas Ã…dahl <jadahl gmail com>
Date: Wed May 13 17:18:50 2020 +0200
clutter/stage-cogl: Only construct damage array if it'll be used
It's only used when we actually swap buffers, which we only do if the
target framebuffer is an onscreen.
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1237
clutter/clutter/cogl/clutter-stage-cogl.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/clutter/clutter/cogl/clutter-stage-cogl.c b/clutter/clutter/cogl/clutter-stage-cogl.c
index 8d025d008c..042621448c 100644
--- a/clutter/clutter/cogl/clutter-stage-cogl.c
+++ b/clutter/clutter/cogl/clutter-stage-cogl.c
@@ -378,24 +378,24 @@ swap_framebuffer (ClutterStageWindow *stage_window,
gboolean swap_with_damage)
{
CoglFramebuffer *framebuffer = clutter_stage_view_get_onscreen (view);
- int *damage, n_rects, i;
-
- n_rects = cairo_region_num_rectangles (swap_region);
- damage = g_newa (int, n_rects * 4);
- for (i = 0; i < n_rects; i++)
- {
- cairo_rectangle_int_t rect;
-
- cairo_region_get_rectangle (swap_region, i, &rect);
- damage[i * 4] = rect.x;
- damage[i * 4 + 1] = rect.y;
- damage[i * 4 + 2] = rect.width;
- damage[i * 4 + 3] = rect.height;
- }
if (cogl_is_onscreen (framebuffer))
{
CoglOnscreen *onscreen = COGL_ONSCREEN (framebuffer);
+ int *damage, n_rects, i;
+
+ n_rects = cairo_region_num_rectangles (swap_region);
+ damage = g_newa (int, n_rects * 4);
+ for (i = 0; i < n_rects; i++)
+ {
+ cairo_rectangle_int_t rect;
+
+ cairo_region_get_rectangle (swap_region, i, &rect);
+ damage[i * 4] = rect.x;
+ damage[i * 4 + 1] = rect.y;
+ damage[i * 4 + 2] = rect.width;
+ damage[i * 4 + 3] = rect.height;
+ }
/* push on the screen */
if (n_rects > 0 && !swap_with_damage)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]