diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2012-03-21 10:39:55 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-16 03:10:22 +0200 |
| commit | f609035fc1bbac810e0d6194621227cb71dd1d67 (patch) | |
| tree | 8aac237ac61970689fa868f0817adbef730a190a /src | |
| parent | b3670edba4bb46389b0005f506c524ea132aac69 (diff) | |
Adding support for obtaining an OpenGL Core Profile context on Mac OSX
Change-Id: I08048ecee9b243b122ee93fce316e498aa7e2d51
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/platformsupport/cglconvenience/cglconvenience.mm | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/platformsupport/cglconvenience/cglconvenience.mm b/src/platformsupport/cglconvenience/cglconvenience.mm index 5c57457e87..325f5c5770 100644 --- a/src/platformsupport/cglconvenience/cglconvenience.mm +++ b/src/platformsupport/cglconvenience/cglconvenience.mm @@ -89,6 +89,18 @@ void *qcgl_createNSOpenGLPixelFormat(const QSurfaceFormat &format) attrs.append(NSOpenGLPFADoubleBuffer); + if (format.profile() == QSurfaceFormat::CoreProfile) { +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 + if ((format.majorVersion() == 3 && format.minorVersion() >= 2) + || format.majorVersion() > 3 ) { + attrs << NSOpenGLPFAOpenGLProfile; + attrs << NSOpenGLProfileVersion3_2Core; + } +#else + qWarning("Mac OSX >= 10.7 is needed for OpenGL Core Profile support"); +#endif + } + if (format.depthBufferSize() > 0) attrs << NSOpenGLPFADepthSize << format.depthBufferSize(); if (format.stencilBufferSize() > 0) |