From 16d8da5ca99211bd180f532d78d7c5943d38c8ad Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Tue, 31 Jul 2012 15:15:56 -0700 Subject: [PATCH] glx: Skip multisampled configs when matching pre-existing X visuals. In __glXScreenInit() we generate the set of GLX visuals in two steps: first we match each pre-existing X visual with a corresponding FBConfig, then we generate a new X visual to correspond to all the remaining FBConfigs. The first step is used for the two default 24-bit visuals (true color and direct color) and for the 32-bit visual. If windowsystem multisampling is enabled in Mesa, we need to ensure that none of these three visuals gets matched to a multisampled config. Fixes a bug with windowsystem multisampling in gnome-shell. If the X server happens to match up a multisampled FBConfig to the 32-bit visual, gnome-shell will try to use it to read pixels from alpha-blended windows (such as gnome-terminal), resulting in no window appearing on screen. Reviewed-by: Ian Romanick Reviewed-by: Chad Versace Signed-off-by: Keith Packard --- glx/glxscreens.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/glx/glxscreens.c b/glx/glxscreens.c index 037b03765..61d590cc8 100644 --- a/glx/glxscreens.c +++ b/glx/glxscreens.c @@ -288,6 +288,9 @@ pickFBConfig(__GLXscreen * pGlxScreen, VisualPtr visual) continue; if (config->visualRating != GLX_NONE) continue; + /* Ignore multisampled configs */ + if (config->sampleBuffers) + continue; if (glxConvertToXVisualType(config->visualType) != visual->class) continue; /* If it's the 32-bit RGBA visual, demand a 32-bit fbconfig. */