AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macOS: Remove support for QSurfaceFormat::StereoBuffers

Browse Source 
The NSOpenGLPFAStereo attribute was deprecated in macOS 10.12, without
any replacement, and adding the attribute to the pixel format results
in context creation failure, so we're assuming the feature is no longer
supported an disable it wholesale on macOS.

Change-Id: I27d9f300fdaff9abe90781e3160b97f8b66121ad
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
This commit is contained in:
Tor Arne Vestbø 2018-08-27 12:43:50 +02:00
parent 917c2de203
commit 2664e84322
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/platforms/cocoa/qcocoaglcontext.mm
View File

@ -217,9 +217,6 @@ NSOpenGLPixelFormat *QCocoaGLContext::pixelFormatForSurfaceFormat(const QSurface
<< NSOpenGLPFASamples << NSOpenGLPixelFormatAttribute(format.samples()); << NSOpenGLPFASamples << NSOpenGLPixelFormatAttribute(format.samples());
} }
if (format.stereo())
attrs << NSOpenGLPFAStereo;
// Allow rendering on GPUs without a connected display // Allow rendering on GPUs without a connected display
attrs << NSOpenGLPFAAllowOfflineRenderers; attrs << NSOpenGLPFAAllowOfflineRenderers;
@ -277,6 +274,9 @@ void QCocoaGLContext::updateSurfaceFormat()
// Debug contexts not supported on macOS // Debug contexts not supported on macOS
m_format.setOption(QSurfaceFormat::DebugContext, false); m_format.setOption(QSurfaceFormat::DebugContext, false);
// Nor are stereo buffers (deprecated in macOS 10.12)
m_format.setOption(QSurfaceFormat::StereoBuffers, false);
// ------------------ Query the pixel format ------------------ // ------------------ Query the pixel format ------------------
NSOpenGLPixelFormat *pixelFormat = m_context.pixelFormat; NSOpenGLPixelFormat *pixelFormat = m_context.pixelFormat;
@ -306,8 +306,6 @@ void QCocoaGLContext::updateSurfaceFormat()
else else
m_format.setSwapBehavior(QSurfaceFormat::SingleBuffer); m_format.setSwapBehavior(QSurfaceFormat::SingleBuffer);
m_format.setOption(QSurfaceFormat::StereoBuffers, [pixelFormat qt_getAttribute:NSOpenGLPFAStereo]);
// ------------------- Query the context ------------------- // ------------------- Query the context -------------------
m_format.setSwapInterval([m_context qt_getParameter:NSOpenGLCPSwapInterval]); m_format.setSwapInterval([m_context qt_getParameter:NSOpenGLCPSwapInterval]);