summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCoprDistGit <copr-devel@lists.fedorahosted.org>2020-06-23 11:30:14 +0000
committerCoprDistGit <copr-devel@lists.fedorahosted.org>2020-06-23 11:30:14 +0000
commitf3b7695ffae2b49013d7ccf80f9ebdffdd3857dc (patch)
treeecc392781ab728c3c615f01860149be524f1a117
parent116d31686ed1c2816d1386f42370d4fda7197328 (diff)
automatic import of mutter
-rw-r--r--mutter-fix-uninitialized-variable-use_clipped_redraw-1323.patch45
1 files changed, 9 insertions, 36 deletions
diff --git a/mutter-fix-uninitialized-variable-use_clipped_redraw-1323.patch b/mutter-fix-uninitialized-variable-use_clipped_redraw-1323.patch
index 14a6b2e..373a9b2 100644
--- a/mutter-fix-uninitialized-variable-use_clipped_redraw-1323.patch
+++ b/mutter-fix-uninitialized-variable-use_clipped_redraw-1323.patch
@@ -1,47 +1,20 @@
-From f511f94aa29d9e265962b3dc7cbaeb392f63a1f8 Mon Sep 17 00:00:00 2001
-From: Daniel van Vugt <daniel.van.vugt@canonical.com>
-Date: Fri, 19 Jun 2020 15:34:59 +0800
-Subject: [PATCH] clutter-stage-cogl: Fix uninitialized variable
- `use_clipped_redraw`
-
-I noticed my system would fall back to the slow unclipped (and
-uncullable) paint path whenever a window touched the left edge of
-the screen. Turns out that was a red herring. Just that
-`use_clipped_redraw` was uninitialized so clipping/culling was used
-randomly.
-
-So the compiler failed to notice `use_clipped_redraw` was uninitialized.
-Weirdly, as soon as you fix that it starts complaining that `buffer_age`
-might be uninitialized, which appears to be wrong. So we initialize that
-too, to shut up the compiler warnings/errors.
-
-https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1323
----
- clutter/clutter/cogl/clutter-stage-cogl.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/clutter/clutter/cogl/clutter-stage-cogl.c b/clutter/clutter/cogl/clutter-stage-cogl.c
-index db87e39337..f7f71e6e16 100644
---- a/clutter/clutter/cogl/clutter-stage-cogl.c
-+++ b/clutter/clutter/cogl/clutter-stage-cogl.c
-@@ -551,7 +551,7 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
- CoglFramebuffer *onscreen = clutter_stage_view_get_onscreen (view);
+--- a/clutter/clutter/cogl/clutter-stage-cogl.c 2020-06-03 02:25:27.392637000 +0300
++++ b/clutter/clutter/cogl/clutter-stage-cogl.c 2020-06-23 14:22:41.530964002 +0300
+@@ -637,7 +637,7 @@
cairo_rectangle_int_t view_rect;
gboolean is_full_redraw;
+ gboolean may_use_clipped_redraw;
- gboolean use_clipped_redraw;
+ gboolean use_clipped_redraw = TRUE;
gboolean can_blit_sub_buffer;
gboolean has_buffer_age;
- gboolean swap_with_damage;
-@@ -561,7 +561,7 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
- cairo_region_t *swap_region;
+ gboolean do_swap_buffer;
+@@ -652,7 +652,7 @@
float fb_scale;
+ int subpixel_compensation = 0;
int fb_width, fb_height;
- int buffer_age;
+ int buffer_age = 0;
- gboolean res;
- clutter_stage_view_get_layout (view, &view_rect);
---
-GitLab
-
+ wrapper = CLUTTER_ACTOR (stage_cogl->wrapper);
+