From d8d2025f06d653b4402651576ede94cf35710d77 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 29 Jan 2019 15:39:57 +0100 Subject: Avoid picking worse formats when matching compatible formats Like we do with fully matching format, pick the first matching one, instead of the last matching one. Fixes: QTBUG-72785 Change-Id: I466e0152a229348b6a3786d5464d1f8ab325d67a Reviewed-by: Gatis Paeglis --- src/platformsupport/glxconvenience/qglxconvenience.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/platformsupport/glxconvenience/qglxconvenience.cpp') diff --git a/src/platformsupport/glxconvenience/qglxconvenience.cpp b/src/platformsupport/glxconvenience/qglxconvenience.cpp index d7cc36627a..238f31994d 100644 --- a/src/platformsupport/glxconvenience/qglxconvenience.cpp +++ b/src/platformsupport/glxconvenience/qglxconvenience.cpp @@ -241,6 +241,8 @@ GLXFBConfig qglx_findConfig(Display *display, int screen , QSurfaceFormat format if (requestedAlpha && actualAlpha < requestedAlpha) continue; compatibleCandidate = candidate; + if (!compatibleCandidate) // Only pick up the first compatible one offered by the server + compatibleCandidate = candidate; if (requestedRed && actualRed != requestedRed) continue; -- cgit v1.2.3 From 4513cf47f14e63ae1c97fa53555ab9c63914cb7a Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 31 Jan 2019 16:04:38 +0100 Subject: Fix merge mistake in 'Avoid picking worse formats when ...' When spliting the patch the edit become an addition instead. Task-number: QTBUG-72785 Change-Id: I92105d0e23e9b8426228f4202d46fa41f928fb94 Reviewed-by: Christian Andersen Reviewed-by: Gatis Paeglis --- src/platformsupport/glxconvenience/qglxconvenience.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/platformsupport/glxconvenience/qglxconvenience.cpp') diff --git a/src/platformsupport/glxconvenience/qglxconvenience.cpp b/src/platformsupport/glxconvenience/qglxconvenience.cpp index 238f31994d..6bd73de8f3 100644 --- a/src/platformsupport/glxconvenience/qglxconvenience.cpp +++ b/src/platformsupport/glxconvenience/qglxconvenience.cpp @@ -240,7 +240,6 @@ GLXFBConfig qglx_findConfig(Display *display, int screen , QSurfaceFormat format continue; if (requestedAlpha && actualAlpha < requestedAlpha) continue; - compatibleCandidate = candidate; if (!compatibleCandidate) // Only pick up the first compatible one offered by the server compatibleCandidate = candidate; -- cgit v1.2.3