diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-11-05 12:49:22 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-11-05 12:49:22 +0000 |
| commit | d24835a60c0c620a27c7a9830b89ed47312739a5 (patch) | |
| tree | 5bd2d865c2f1c93246b1d19a631f1a9581513d0e /src/plugins/platforms/cocoa/qcocoaglcontext.mm | |
| parent | 60197af4850e13409f26551ce812e866602e6926 (diff) | |
| parent | b36c5bdc30040b5100da2a003056d3519972e178 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into 5.12.0" into refs/staging/5.12.0v5.12.0-beta4
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoaglcontext.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaglcontext.mm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.mm b/src/plugins/platforms/cocoa/qcocoaglcontext.mm index 1cd77a22e4..93d95b38ea 100644 --- a/src/plugins/platforms/cocoa/qcocoaglcontext.mm +++ b/src/plugins/platforms/cocoa/qcocoaglcontext.mm @@ -216,8 +216,13 @@ NSOpenGLPixelFormat *QCocoaGLContext::pixelFormatForSurfaceFormat(const QSurface << NSOpenGLPFASamples << NSOpenGLPixelFormatAttribute(format.samples()); } - // Allow rendering on GPUs without a connected display - attrs << NSOpenGLPFAAllowOfflineRenderers; + //Workaround for problems with Chromium and offline renderers on the lat 2013 MacPros. + //FIXME: Think if this could be solved via QSurfaceFormat in the future. + static bool offlineRenderersAllowed = qEnvironmentVariableIsEmpty("QT_MAC_PRO_WEBENGINE_WORKAROUND"); + if (offlineRenderersAllowed) { + // Allow rendering on GPUs without a connected display + attrs << NSOpenGLPFAAllowOfflineRenderers; + } // FIXME: Pull this information out of the NSView QByteArray useLayer = qgetenv("QT_MAC_WANTS_LAYER"); |