diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-24 11:42:12 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-27 05:15:38 +0200 |
| commit | fff26f62877f947e5cf67276cefa69ce064783de (patch) | |
| tree | 74a6859318366c515bf0dbb29359f0ac92da557b /src/platformsupport/cglconvenience | |
| parent | 9457f8ea91b1e239efd07724ce816ec937aeb1ab (diff) | |
Respect the QSurfaceFormat when constructing a QOpenGLContext on Mac
Change-Id: I1a17d2e7e060d9931d84afeb0fd42bc3b1f44e5d
Reviewed-on: http://codereview.qt-project.org/5527
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/platformsupport/cglconvenience')
| -rw-r--r-- | src/platformsupport/cglconvenience/cglconvenience.mm | 35 | ||||
| -rw-r--r-- | src/platformsupport/cglconvenience/cglconvenience_p.h | 2 |
2 files changed, 24 insertions, 13 deletions
diff --git a/src/platformsupport/cglconvenience/cglconvenience.mm b/src/platformsupport/cglconvenience/cglconvenience.mm index 6b0354834d..280baf48a5 100644 --- a/src/platformsupport/cglconvenience/cglconvenience.mm +++ b/src/platformsupport/cglconvenience/cglconvenience.mm @@ -42,6 +42,7 @@ #include "cglconvenience_p.h" #include <QtCore/private/qcore_mac_p.h> #include <Cocoa/Cocoa.h> +#include <QVector> void (*qcgl_getProcAddress(const QByteArray &procName))() { @@ -81,26 +82,36 @@ QSurfaceFormat qcgl_surfaceFormat() return format; } -void *qcgl_createNSOpenGLPixelFormat() +void *qcgl_createNSOpenGLPixelFormat(const QSurfaceFormat &format) { - NSOpenGLPixelFormatAttribute attrs[] = - { - NSOpenGLPFADoubleBuffer, - NSOpenGLPFADepthSize, 32, - NSOpenGLPFAMultisample, - NSOpenGLPFASampleBuffers, (NSOpenGLPixelFormatAttribute)1, - NSOpenGLPFASamples, (NSOpenGLPixelFormatAttribute) 8, - 0 - }; - NSOpenGLPixelFormat* pixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:attrs]; + QVector<NSOpenGLPixelFormatAttribute> attrs; + + attrs.append(NSOpenGLPFADoubleBuffer); + + if (format.depthBufferSize() > 0) + attrs << NSOpenGLPFADepthSize << format.depthBufferSize(); + if (format.stencilBufferSize() > 0) + attrs << NSOpenGLPFAStencilSize << format.stencilBufferSize(); + if (format.alphaBufferSize() > 0) + attrs << NSOpenGLPFAAlphaSize << format.alphaBufferSize(); + + if (format.samples() > 0) { + attrs << NSOpenGLPFAMultisample + << NSOpenGLPFASampleBuffers << (NSOpenGLPixelFormatAttribute) 1 + << NSOpenGLPFASamples << (NSOpenGLPixelFormatAttribute) format.samples(); + } + + attrs << 0; + + NSOpenGLPixelFormat* pixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:attrs.constData()]; return pixelFormat; } CGLContextObj qcgl_createGlContext() { CGLContextObj context; - NSOpenGLPixelFormat *format = reinterpret_cast<NSOpenGLPixelFormat *>(qcgl_createNSOpenGLPixelFormat()); + NSOpenGLPixelFormat *format = reinterpret_cast<NSOpenGLPixelFormat *>(qcgl_createNSOpenGLPixelFormat(qcgl_surfaceFormat())); CGLPixelFormatObj cglFormat = static_cast<CGLPixelFormatObj>([format CGLPixelFormatObj]); CGLCreateContext(cglFormat ,NULL, &context); return context; diff --git a/src/platformsupport/cglconvenience/cglconvenience_p.h b/src/platformsupport/cglconvenience/cglconvenience_p.h index 96433b69d0..facf8c9b7f 100644 --- a/src/platformsupport/cglconvenience/cglconvenience_p.h +++ b/src/platformsupport/cglconvenience/cglconvenience_p.h @@ -48,7 +48,7 @@ void (*qcgl_getProcAddress(const QByteArray &procName))(); QSurfaceFormat qcgl_surfaceFormat(); -void *qcgl_createNSOpenGLPixelFormat(); +void *qcgl_createNSOpenGLPixelFormat(const QSurfaceFormat &format); CGLContextObj qcgl_createGlContext(); #endif // QMACGLCONVENIENCE_H |