Properly read back the actual format in xcb and xlib plugins.

Change-Id: Iccef2c4a87863b93914b84edf3a6015dad5e512a
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>

1 files changed, 10 insertions, 5 deletions

diff --git a/src/platformsupport/glxconvenience/qglxconvenience.cpp b/src/platformsupport/glxconvenience/qglxconvenience.cpp
index 11d8a5901f..f619bf53b8 100644
--- a/src/platformsupport/glxconvenience/qglxconvenience.cpp
+++ b/src/platformsupport/glxconvenience/qglxconvenience.cpp
@@ -153,23 +153,28 @@ GLXFBConfig qglx_findConfig(Display *display, int screen , const QSurfaceFormat
 
             XFree(configs);
         }
-        reducedFormat = qglx_reduceSurfaceFormat(reducedFormat,&reduced);
+        if (!chosenConfig)
+            reducedFormat = qglx_reduceSurfaceFormat(reducedFormat,&reduced);
     }
 
     return chosenConfig;
 }
 
-XVisualInfo *qglx_findVisualInfo(Display *display, int screen, const QSurfaceFormat &format)
+XVisualInfo *qglx_findVisualInfo(Display *display, int screen, QSurfaceFormat *format)
 {
+    Q_ASSERT(format);
+
     XVisualInfo *visualInfo = 0;
 
-    GLXFBConfig config = qglx_findConfig(display,screen,format);
-    if (config)
+    GLXFBConfig config = qglx_findConfig(display,screen,*format);
+    if (config) {
         visualInfo = glXGetVisualFromFBConfig(display, config);
+        *format = qglx_surfaceFormatFromGLXFBConfig(display, config);
+    }
 
     // attempt to fall back to glXChooseVisual
     bool reduced = true;
-    QSurfaceFormat reducedFormat = format;
+    QSurfaceFormat reducedFormat = *format;
     while (!visualInfo && reduced) {
         QVarLengthArray<int, 13> attribs;
         attribs.append(GLX_RGBA);