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

macOS: Clean up and rename QCocoaGLContext::pixelFormatForSurfaceFormat()

Browse Source 
Change-Id: I1a439d8cec950cb23c977eedfcc1b8810c6cd1c5
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
This commit is contained in:
Tor Arne Vestbø 2018-08-01 12:52:00 +02:00
parent 85357472d0
commit 1d42241d37
2 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/cocoa/qcocoaglcontext.h
View File

@ -72,7 +72,7 @@ public:
QFunctionPointer getProcAddress(const char *procName) override; QFunctionPointer getProcAddress(const char *procName) override;
private: private:
static NSOpenGLPixelFormat *createNSOpenGLPixelFormat(const QSurfaceFormat &format); static NSOpenGLPixelFormat *pixelFormatForSurfaceFormat(const QSurfaceFormat &format);
bool setActiveWindow(QWindow *window); bool setActiveWindow(QWindow *window);
void updateSurfaceFormat(); void updateSurfaceFormat();

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

@ -113,8 +113,9 @@ QCocoaGLContext::QCocoaGLContext(const QSurfaceFormat &format, QPlatformOpenGLCo
} }
} }
// create native context for the requested pixel format and share // ------------------------- Create NSOpenGLContext -------------------------
NSOpenGLPixelFormat *pixelFormat = createNSOpenGLPixelFormat(m_format);
NSOpenGLPixelFormat *pixelFormat = [pixelFormatForSurfaceFormat(m_format) autorelease];
m_context = [[NSOpenGLContext alloc] initWithFormat:pixelFormat shareContext:m_shareContext]; m_context = [[NSOpenGLContext alloc] initWithFormat:pixelFormat shareContext:m_shareContext];
// retry without sharing on context creation failure. // retry without sharing on context creation failure.
@ -125,8 +126,6 @@ QCocoaGLContext::QCocoaGLContext(const QSurfaceFormat &format, QPlatformOpenGLCo
m_context = [[NSOpenGLContext alloc] initWithFormat:pixelFormat shareContext:nil]; m_context = [[NSOpenGLContext alloc] initWithFormat:pixelFormat shareContext:nil];
} }
// give up if we still did not get a native context
[pixelFormat release];
if (!m_context) { if (!m_context) {
qCWarning(lcQpaOpenGLContext, "Failed to create NSOpenGLContext"); qCWarning(lcQpaOpenGLContext, "Failed to create NSOpenGLContext");
return; return;
@ -148,18 +147,10 @@ QCocoaGLContext::QCocoaGLContext(const QSurfaceFormat &format, QPlatformOpenGLCo
updateSurfaceFormat(); updateSurfaceFormat();
} }
NSOpenGLPixelFormat *QCocoaGLContext::createNSOpenGLPixelFormat(const QSurfaceFormat &format) NSOpenGLPixelFormat *QCocoaGLContext::pixelFormatForSurfaceFormat(const QSurfaceFormat &format)
{ {
QVector<NSOpenGLPixelFormatAttribute> attrs; QVector<NSOpenGLPixelFormatAttribute> attrs;
if (format.swapBehavior() == QSurfaceFormat::DoubleBuffer
|| format.swapBehavior() == QSurfaceFormat::DefaultSwapBehavior)
attrs.append(NSOpenGLPFADoubleBuffer);
else if (format.swapBehavior() == QSurfaceFormat::TripleBuffer)
attrs.append(NSOpenGLPFATripleBuffer);
// Select OpenGL profile
attrs << NSOpenGLPFAOpenGLProfile; attrs << NSOpenGLPFAOpenGLProfile;
if (format.profile() == QSurfaceFormat::CoreProfile) { if (format.profile() == QSurfaceFormat::CoreProfile) {
if (format.version() >= qMakePair(4, 1)) if (format.version() >= qMakePair(4, 1))
@ -172,32 +163,45 @@ NSOpenGLPixelFormat *QCocoaGLContext::createNSOpenGLPixelFormat(const QSurfaceFo
attrs << NSOpenGLProfileVersionLegacy; attrs << NSOpenGLProfileVersionLegacy;
} }
switch (format.swapBehavior()) {
case QSurfaceFormat::SingleBuffer:
break; // The NSOpenGLPixelFormat default, no attribute to set
case QSurfaceFormat::DefaultSwapBehavior:
// Technically this should be single-buffered, but we force double-buffered
// FIXME: Why do we force double-buffered?
Q_FALLTHROUGH();
case QSurfaceFormat::DoubleBuffer:
attrs.append(NSOpenGLPFADoubleBuffer);
break;
case QSurfaceFormat::TripleBuffer:
attrs.append(NSOpenGLPFATripleBuffer);
break;
}
if (format.depthBufferSize() > 0) if (format.depthBufferSize() > 0)
attrs << NSOpenGLPFADepthSize << format.depthBufferSize(); attrs << NSOpenGLPFADepthSize << format.depthBufferSize();
if (format.stencilBufferSize() > 0) if (format.stencilBufferSize() > 0)
attrs << NSOpenGLPFAStencilSize << format.stencilBufferSize(); attrs << NSOpenGLPFAStencilSize << format.stencilBufferSize();
if (format.alphaBufferSize() > 0) if (format.alphaBufferSize() > 0)
attrs << NSOpenGLPFAAlphaSize << format.alphaBufferSize(); attrs << NSOpenGLPFAAlphaSize << format.alphaBufferSize();
if ((format.redBufferSize() > 0) && if (format.redBufferSize() > 0 && format.greenBufferSize() > 0 && format.blueBufferSize() > 0) {
(format.greenBufferSize() > 0) && const int colorSize = format.redBufferSize() + format.greenBufferSize() + format.blueBufferSize();
(format.blueBufferSize() > 0)) {
const int colorSize = format.redBufferSize() +
format.greenBufferSize() +
format.blueBufferSize();
attrs << NSOpenGLPFAColorSize << colorSize << NSOpenGLPFAMinimumPolicy; attrs << NSOpenGLPFAColorSize << colorSize << NSOpenGLPFAMinimumPolicy;
} }
if (format.samples() > 0) { if (format.samples() > 0) {
attrs << NSOpenGLPFAMultisample attrs << NSOpenGLPFAMultisample
<< NSOpenGLPFASampleBuffers << (NSOpenGLPixelFormatAttribute) 1 << NSOpenGLPFASampleBuffers << NSOpenGLPixelFormatAttribute(1)
<< NSOpenGLPFASamples << (NSOpenGLPixelFormatAttribute) format.samples(); << NSOpenGLPFASamples << NSOpenGLPixelFormatAttribute(format.samples());
} }
if (format.stereo()) if (format.stereo())
attrs << NSOpenGLPFAStereo; attrs << NSOpenGLPFAStereo;
// Allow rendering on GPUs without a connected display
attrs << NSOpenGLPFAAllowOfflineRenderers; attrs << NSOpenGLPFAAllowOfflineRenderers;
// FIXME: Pull this information out of the NSView
QByteArray useLayer = qgetenv("QT_MAC_WANTS_LAYER"); QByteArray useLayer = qgetenv("QT_MAC_WANTS_LAYER");
if (!useLayer.isEmpty() && useLayer.toInt() > 0) { if (!useLayer.isEmpty() && useLayer.toInt() > 0) {
// Disable the software rendering fallback. This makes compositing // Disable the software rendering fallback. This makes compositing
@ -205,8 +209,7 @@ NSOpenGLPixelFormat *QCocoaGLContext::createNSOpenGLPixelFormat(const QSurfaceFo
attrs << NSOpenGLPFANoRecovery; attrs << NSOpenGLPFANoRecovery;
} }
attrs << 0; attrs << 0; // 0-terminate array
return [[NSOpenGLPixelFormat alloc] initWithAttributes:attrs.constData()]; return [[NSOpenGLPixelFormat alloc] initWithAttributes:attrs.constData()];
} }