[PATCH v2 2/3] winex11.drv: Pass visual to is_wxrformat_compatible_with_visual.

[Paul Gofman]

From: Paul Gofman

---
 dlls/winex11.drv/xrender.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c
index bac3e6fac4b..48e2fea4280 100644
--- a/dlls/winex11.drv/xrender.c
+++ b/dlls/winex11.drv/xrender.c
@@ -250,15 +250,12 @@ static BOOL get_xrender_template(const WineXRenderFormatTemplate *fmt, XRenderPi
     return TRUE;
 }

-static BOOL is_wxrformat_compatible_with_default_visual(const WineXRenderFormatTemplate *fmt)
+static BOOL is_wxrformat_compatible_with_visual( const WineXRenderFormatTemplate *fmt, const XVisualInfo *visual )
 {
-    if(fmt->depth != default_visual.depth) return FALSE;
-    if( (fmt->redMask << fmt->red) != default_visual.red_mask) return FALSE;
-    if( (fmt->greenMask << fmt->green) != default_visual.green_mask) return FALSE;
-    if( (fmt->blueMask << fmt->blue) != default_visual.blue_mask) return FALSE;
-
-    /* We never select a default ARGB visual */
-    if(fmt->alphaMask) return FALSE;
+    if (fmt->depth != visual->depth) return FALSE;
+    if ((fmt->redMask << fmt->red) != visual->red_mask) return FALSE;
+    if ((fmt->greenMask << fmt->green) != visual->green_mask) return FALSE;
+    if ((fmt->blueMask << fmt->blue) != visual->blue_mask) return FALSE;
     return TRUE;
 }

@@ -278,7 +275,8 @@ static int load_xrender_formats(void)
             TRACE( "Loaded root pict_format with id=%#lx\n", pict_formats[i]->id );
             continue;
         }
-        if(is_wxrformat_compatible_with_default_visual(&wxr_formats_template[i]))
+        if (is_wxrformat_compatible_with_visual( &wxr_formats_template[i], &default_visual ) &&
+            !wxr_formats_template[i].alphaMask /* We never select a default ARGB visual */)
         {
             pict_formats[i] = pXRenderFindVisualFormat(gdi_display, default_visual.visual);
             if (!pict_formats[i])