From 312793f28eaa1eddd8ffd15f42f51c31ecd1c4ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Wed, 23 Oct 2019 13:15:07 +0200
Subject: macOS: Respect Qt::AA_UseSoftwareOpenGL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ia83e8e9e571e4f46d2a8d810c376015552755457
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
---
 src/plugins/platforms/cocoa/qcocoaglcontext.mm | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src')

diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.mm b/src/plugins/platforms/cocoa/qcocoaglcontext.mm
index 7452d53579..900f0608c8 100644
--- a/src/plugins/platforms/cocoa/qcocoaglcontext.mm
+++ b/src/plugins/platforms/cocoa/qcocoaglcontext.mm
@@ -223,6 +223,12 @@ NSOpenGLPixelFormat *QCocoaGLContext::pixelFormatForSurfaceFormat(const QSurface
         attrs << NSOpenGLPFAAllowOfflineRenderers;
     }
 
+    if (qGuiApp->testAttribute(Qt::AA_UseSoftwareOpenGL)) {
+        // kCGLRendererGenericFloatID is the modern software renderer on macOS,
+        // as opposed to kCGLRendererGenericID, which is deprecated.
+        attrs << NSOpenGLPFARendererID << kCGLRendererGenericFloatID;
+    }
+
     // FIXME: Pull this information out of the NSView
     QByteArray useLayer = qgetenv("QT_MAC_WANTS_LAYER");
     if (!useLayer.isEmpty() && useLayer.toInt() > 0) {
-- 
cgit v1.2.3