[metacity] xrender: simplify determine_mode
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity] xrender: simplify determine_mode
- Date: Sun, 22 Sep 2019 21:17:26 +0000 (UTC)
commit 142778a2103bc342acd9bd5ff89a751c40e7e5c2
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Sat Sep 21 23:01:26 2019 +0300
xrender: simplify determine_mode
src/compositor/meta-compositor-xrender.c | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
---
diff --git a/src/compositor/meta-compositor-xrender.c b/src/compositor/meta-compositor-xrender.c
index 7a7fe49d..d49f4504 100644
--- a/src/compositor/meta-compositor-xrender.c
+++ b/src/compositor/meta-compositor-xrender.c
@@ -1918,12 +1918,6 @@ determine_mode (MetaCompositorXRender *xrender,
MetaDisplay *display = meta_compositor_get_display (compositor);
Display *xdisplay = meta_display_get_xdisplay (display);
- if (cw->alpha_pict)
- {
- XRenderFreePicture (xdisplay, cw->alpha_pict);
- cw->alpha_pict = None;
- }
-
format = XRenderFindVisualFormat (xdisplay, get_toplevel_xvisual (cw->window));
if ((format && format->type == PictTypeDirect && format->direct.alphaMask)
@@ -1931,16 +1925,6 @@ determine_mode (MetaCompositorXRender *xrender,
cw->mode = WINDOW_ARGB;
else
cw->mode = WINDOW_SOLID;
-
- if (cw->extents)
- {
- XserverRegion damage;
- damage = XFixesCreateRegion (xdisplay, NULL, 0);
- XFixesCopyRegion (xdisplay, damage, cw->extents);
-
- meta_compositor_add_damage (compositor, "determine_mode", damage);
- XFixesDestroyRegion (xdisplay, damage);
- }
}
static void
@@ -2584,6 +2568,12 @@ meta_compositor_xrender_window_opacity_changed (MetaCompositor *compositor,
determine_mode (xrender, cw);
cw->needs_shadow = window_has_shadow (xrender, cw);
+ if (cw->alpha_pict)
+ {
+ XRenderFreePicture (xrender->xdisplay, cw->alpha_pict);
+ cw->alpha_pict = None;
+ }
+
if (cw->shadow)
{
XRenderFreePicture (xrender->xdisplay, cw->shadow);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]