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/plugins/platforms/cocoa | |
| 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/plugins/platforms/cocoa')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaglcontext.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaglcontext.mm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.h b/src/plugins/platforms/cocoa/qcocoaglcontext.h index 0cc2c2c2bd..dc8a428a91 100644 --- a/src/plugins/platforms/cocoa/qcocoaglcontext.h +++ b/src/plugins/platforms/cocoa/qcocoaglcontext.h @@ -68,7 +68,7 @@ public: void update(); - static NSOpenGLPixelFormat *createNSOpenGLPixelFormat(); + static NSOpenGLPixelFormat *createNSOpenGLPixelFormat(const QSurfaceFormat &format); NSOpenGLContext *nsOpenGLContext() const; private: diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.mm b/src/plugins/platforms/cocoa/qcocoaglcontext.mm index 20b637a668..bc9f55df62 100644 --- a/src/plugins/platforms/cocoa/qcocoaglcontext.mm +++ b/src/plugins/platforms/cocoa/qcocoaglcontext.mm @@ -53,7 +53,7 @@ QCocoaGLContext::QCocoaGLContext(const QSurfaceFormat &format, QPlatformOpenGLCo { QCocoaAutoReleasePool pool; // For the SG Canvas render thread. - NSOpenGLPixelFormat *pixelFormat = static_cast <NSOpenGLPixelFormat *>(qcgl_createNSOpenGLPixelFormat()); + NSOpenGLPixelFormat *pixelFormat = static_cast <NSOpenGLPixelFormat *>(qcgl_createNSOpenGLPixelFormat(format)); NSOpenGLContext *actualShare = share ? static_cast<QCocoaGLContext *>(share)->m_context : 0; m_context = [NSOpenGLContext alloc]; @@ -128,9 +128,9 @@ void QCocoaGLContext::update() [m_context update]; } -NSOpenGLPixelFormat *QCocoaGLContext::createNSOpenGLPixelFormat() +NSOpenGLPixelFormat *QCocoaGLContext::createNSOpenGLPixelFormat(const QSurfaceFormat &format) { - return static_cast<NSOpenGLPixelFormat *>(qcgl_createNSOpenGLPixelFormat()); + return static_cast<NSOpenGLPixelFormat *>(qcgl_createNSOpenGLPixelFormat(format)); } NSOpenGLContext *QCocoaGLContext::nsOpenGLContext() const |