[metacity] compositor: simplify get_window_format

[Alberts Muktupāvels <muktupavels src gnome org>]

commit f8dfbed7937eabb2d0be21268779f5146ca59da5
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Mon Mar 6 01:07:04 2017 +0200

    compositor: simplify get_window_format

 src/compositor/meta-compositor-xrender.c |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/src/compositor/meta-compositor-xrender.c b/src/compositor/meta-compositor-xrender.c
index 9f13c1c..6764c22 100644
--- a/src/compositor/meta-compositor-xrender.c
+++ b/src/compositor/meta-compositor-xrender.c
@@ -1241,18 +1241,21 @@ get_visible_region (MetaCompWindow *cw)
 }
 
 static XRenderPictFormat *
-get_window_format (MetaCompWindow *cw)
+get_window_format (Display        *xdisplay,
+                   MetaCompWindow *cw)
 {
-  MetaScreen *screen = cw->screen;
-  MetaDisplay *display = meta_screen_get_display (screen);
-  Display *xdisplay = meta_display_get_xdisplay (display);
   XRenderPictFormat *format;
-  int screen_number = meta_screen_get_screen_number (screen);
 
   format = XRenderFindVisualFormat (xdisplay, cw->attrs.visual);
+
   if (!format)
-    format = XRenderFindVisualFormat (xdisplay,
-                                      DefaultVisual (xdisplay, screen_number));
+    {
+      Visual *visual;
+
+      visual = DefaultVisual (xdisplay, DefaultScreen (xdisplay));
+      format = XRenderFindVisualFormat (xdisplay, visual);
+    }
+
   return format;
 }
 
@@ -1281,7 +1284,7 @@ get_window_picture (MetaCompWindow *cw)
   if (cw->back_pixmap != None)
     draw = cw->back_pixmap;
 
-  format = get_window_format (cw);
+  format = get_window_format (xdisplay, cw);
   if (format)
     {
       Picture pict;