From 11f46a41caa0baa135d6080793dca2c0f246bb0c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Dec 03 2020 08:10:09 +0000 Subject: import mutter-3.32.2-50.el8 --- diff --git a/SOURCES/0001-Add-support-for-quad-buffer-stereo.patch b/SOURCES/0001-Add-support-for-quad-buffer-stereo.patch index 38a1213..1130e5d 100644 --- a/SOURCES/0001-Add-support-for-quad-buffer-stereo.patch +++ b/SOURCES/0001-Add-support-for-quad-buffer-stereo.patch @@ -1,4 +1,4 @@ -From 8d7356fd7439f94f163438d55f2b2d3d918de96d Mon Sep 17 00:00:00 2001 +From fd67e75df470b50510b68ccf0f52b0b98d05c63f Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Thu, 8 May 2014 18:44:15 -0400 Subject: [PATCH] Add support for quad-buffer stereo @@ -21,7 +21,7 @@ texture_from_pixmap. src/compositor/compositor-private.h | 9 ++ src/compositor/compositor.c | 125 +++++++++++++++ src/compositor/meta-shaped-texture-private.h | 5 +- - src/compositor/meta-shaped-texture.c | 84 +++++++++- + src/compositor/meta-shaped-texture.c | 85 +++++++++- src/compositor/meta-surface-actor-wayland.c | 2 +- src/compositor/meta-surface-actor-x11.c | 54 ++++++- src/compositor/meta-surface-actor-x11.h | 5 + @@ -32,7 +32,7 @@ texture_from_pixmap. src/core/stereo.h | 28 ++++ src/meson.build | 2 + src/wayland/meta-wayland-surface.c | 2 +- - 14 files changed, 481 insertions(+), 20 deletions(-) + 14 files changed, 482 insertions(+), 20 deletions(-) create mode 100644 src/core/stereo.c create mode 100644 src/core/stereo.h @@ -265,7 +265,7 @@ index a86a2bff0..d0efdd4dc 100644 gboolean is_y_inverted); void meta_shaped_texture_set_snippet (MetaShapedTexture *stex, diff --git a/src/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c -index d64e214e5..e77a32109 100644 +index d64e214e5..332b4c814 100644 --- a/src/compositor/meta-shaped-texture.c +++ b/src/compositor/meta-shaped-texture.c @@ -88,8 +88,10 @@ struct _MetaShapedTexture @@ -287,7 +287,7 @@ index d64e214e5..e77a32109 100644 stex->texture = NULL; stex->mask_texture = NULL; -@@ -297,6 +300,9 @@ meta_shaped_texture_dispose (GObject *object) +@@ -297,7 +300,11 @@ meta_shaped_texture_dispose (GObject *object) meta_texture_tower_free (stex->paint_tower); stex->paint_tower = NULL; @@ -295,9 +295,11 @@ index d64e214e5..e77a32109 100644 + g_clear_pointer (&stex->paint_tower_right, meta_texture_tower_free); + g_clear_pointer (&stex->texture, cogl_object_unref); ++ g_clear_pointer (&stex->texture_right, cogl_object_unref); g_clear_pointer (&stex->opaque_region, cairo_region_destroy); -@@ -507,8 +513,9 @@ paint_clipped_rectangle (MetaShapedTexture *stex, + meta_shaped_texture_set_mask_texture (stex, NULL); +@@ -507,8 +514,9 @@ paint_clipped_rectangle (MetaShapedTexture *stex, } static void @@ -309,7 +311,7 @@ index d64e214e5..e77a32109 100644 { int width, height; -@@ -516,8 +523,11 @@ set_cogl_texture (MetaShapedTexture *stex, +@@ -516,8 +524,11 @@ set_cogl_texture (MetaShapedTexture *stex, if (stex->texture) cogl_object_unref (stex->texture); @@ -321,7 +323,7 @@ index d64e214e5..e77a32109 100644 if (cogl_tex != NULL) { -@@ -531,6 +541,9 @@ set_cogl_texture (MetaShapedTexture *stex, +@@ -531,6 +542,9 @@ set_cogl_texture (MetaShapedTexture *stex, height = 0; } @@ -331,7 +333,7 @@ index d64e214e5..e77a32109 100644 if (stex->tex_width != width || stex->tex_height != height) { -@@ -544,8 +557,23 @@ set_cogl_texture (MetaShapedTexture *stex, +@@ -544,8 +558,23 @@ set_cogl_texture (MetaShapedTexture *stex, * previous buffer. We only queue a redraw in response to surface * damage. */ @@ -356,7 +358,7 @@ index d64e214e5..e77a32109 100644 } static gboolean -@@ -779,7 +807,9 @@ meta_shaped_texture_paint (ClutterActor *actor) +@@ -779,7 +808,9 @@ meta_shaped_texture_paint (ClutterActor *actor) { MetaShapedTexture *stex = META_SHAPED_TEXTURE (actor); CoglTexture *paint_tex; @@ -366,7 +368,7 @@ index d64e214e5..e77a32109 100644 if (!stex->texture) return; -@@ -841,7 +871,32 @@ meta_shaped_texture_paint (ClutterActor *actor) +@@ -841,7 +872,32 @@ meta_shaped_texture_paint (ClutterActor *actor) return; fb = cogl_get_draw_framebuffer (); @@ -400,7 +402,7 @@ index d64e214e5..e77a32109 100644 } static void -@@ -915,6 +970,12 @@ meta_shaped_texture_set_create_mipmaps (MetaShapedTexture *stex, +@@ -915,6 +971,12 @@ meta_shaped_texture_set_create_mipmaps (MetaShapedTexture *stex, stex->create_mipmaps = create_mipmaps; base_texture = create_mipmaps ? stex->texture : NULL; meta_texture_tower_set_base_texture (stex->paint_tower, base_texture); @@ -413,7 +415,7 @@ index d64e214e5..e77a32109 100644 } } -@@ -1046,6 +1107,12 @@ meta_shaped_texture_update_area (MetaShapedTexture *stex, +@@ -1046,6 +1108,12 @@ meta_shaped_texture_update_area (MetaShapedTexture *stex, clip.y, clip.width, clip.height); @@ -426,7 +428,7 @@ index d64e214e5..e77a32109 100644 stex->prev_invalidation = stex->last_invalidation; stex->last_invalidation = g_get_monotonic_time (); -@@ -1092,17 +1159,18 @@ meta_shaped_texture_update_area (MetaShapedTexture *stex, +@@ -1092,17 +1160,18 @@ meta_shaped_texture_update_area (MetaShapedTexture *stex, } /** @@ -901,5 +903,5 @@ index da0acfcbb..ddad1a45c 100644 meta_shaped_texture_set_is_y_inverted (stex, is_y_inverted); g_clear_pointer (&snippet, cogl_object_unref); -- -2.25.1 +2.28.0 diff --git a/SPECS/mutter.spec b/SPECS/mutter.spec index 9d1f1fd..4600dc9 100644 --- a/SPECS/mutter.spec +++ b/SPECS/mutter.spec @@ -8,7 +8,7 @@ Name: mutter Version: 3.32.2 -Release: 49%{?dist} +Release: 50%{?dist} Summary: Window and compositing manager based on Clutter License: GPLv2+ @@ -303,6 +303,10 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_datadir}/mutter-%{mutter_api_version}/tests %changelog +* Thu Nov 26 2020 Jonas Ådahl - 3.32.2-50 +- Fix GLX stereo buffer rebase error + Resolves: #1889528 + * Tue Nov 10 2020 Jonas Ådahl - 3.32.2-49 - Add tile based shadow buffer damage tracking Resolves: #1670273