kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Re-enable integrated GPU on macOS.

Browse source 
This limits the fix introduced in a058e75a to just 10.14.4,
as #5858 seems to be fixed in 10.14.5.
This commit is contained in:
Konstantin Tcepliaev 2019-05-19 22:37:49 +02:00 • committed by John Preston
parent b2f821d3de
commit 48cee21b9f
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Telegram/Patches/qtbase_5_6_2.diff
View file

@ -256,17 +256,15 @@ diff --git a/src/platformsupport/cglconvenience/cglconvenience.mm b/src/platform
index fb609ae485..7cca45ded4 100644 index fb609ae485..7cca45ded4 100644
--- a/src/platformsupport/cglconvenience/cglconvenience.mm --- a/src/platformsupport/cglconvenience/cglconvenience.mm
+++ b/src/platformsupport/cglconvenience/cglconvenience.mm +++ b/src/platformsupport/cglconvenience/cglconvenience.mm
@@ -128,7 +128,14 @@ void *qcgl_createNSOpenGLPixelFormat(const QSurfaceFormat &format) @@ -128,7 +128,12 @@ void *qcgl_createNSOpenGLPixelFormat(const QSurfaceFormat &format)
if (format.stereo()) if (format.stereo())
attrs << NSOpenGLPFAStereo; attrs << NSOpenGLPFAStereo;
- attrs << NSOpenGLPFAAllowOfflineRenderers; - attrs << NSOpenGLPFAAllowOfflineRenderers;
+ // Patch: Fix macOS regression. It crashes on GPU switches. + // Patch: Fix macOS regression. On 10.14.4, it crashes on GPU switches.
+ // See https://bugreports.qt.io/browse/QTCREATORBUG-22215 + // See https://bugreports.qt.io/browse/QTCREATORBUG-22215
+ static const QAppleOperatingSystemVersion version = qt_apple_os_version(); + static const QAppleOperatingSystemVersion version = qt_apple_os_version();
+ if ((version.major < 10) + if (!(version.major == 10 && version.minor == 14 && version.patch == 4))
+ || (version.major == 10 && version.minor < 14)
+ || (version.major == 10 && version.minor == 14 && version.patch < 4)) {
+ attrs << NSOpenGLPFAAllowOfflineRenderers; + attrs << NSOpenGLPFAAllowOfflineRenderers;
+ } + }