1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS: Use correct virtual screen when resolving GL surface format

Browse Source 
Change-Id: I8288db85c8e99bf9fccfcfbca7f9e3594d00fa48
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Tor Arne Vestbø 2019-07-16 23:45:48 +02:00
parent d2e4bde5d0
commit d224c762bc
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,8 @@
#include "qcocoaglcontext.h"
#include "qcocoawindow.h"
#include "qcocoahelpers.h"
#include "qcocoascreen.h"
#include <qdebug.h>
#include <QtPlatformHeaders/qcocoanativecontext.h>
#include <dlfcn.h>
@ -275,9 +277,28 @@ void QCocoaGLContext::updateSurfaceFormat()
NSOpenGLPixelFormat *pixelFormat = m_context.pixelFormat;
GLint virtualScreen = [&, this]() {
auto *platformScreen = static_cast<QCocoaScreen*>(context()->screen()->handle());
auto displayId = platformScreen->nativeScreen().qt_displayId;
auto requestedDisplay = CGDisplayIDToOpenGLDisplayMask(displayId);
for (int i = 0; i < pixelFormat.numberOfVirtualScreens; ++i) {
GLint supportedDisplays;
[pixelFormat getValues:&supportedDisplays forAttribute:NSOpenGLPFAScreenMask forVirtualScreen:i];
// Note: The mask returned for NSOpenGLPFAScreenMask is a bit mask of
// physical displays that the renderer can drive, while the one returned
// from CGDisplayIDToOpenGLDisplayMask has a single bit set, representing
// that particular display.
if (requestedDisplay & supportedDisplays)
return i;
}
qCWarning(lcQpaOpenGLContext) << "Could not find virtual screen for"
<< platformScreen << "with displayId" << displayId;
return 0;
}();
auto pixelFormatAttribute = [&](NSOpenGLPixelFormatAttribute attribute) {
int value = 0;
[pixelFormat getValues:&value forAttribute:attribute forVirtualScreen:0];
[pixelFormat getValues:&value forAttribute:attribute forVirtualScreen:virtualScreen];
return value;
};