From 8b8578a155b7932a79049174f913eea3379c0f28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Mon, 7 Aug 2017 11:54:20 +0200 Subject: macOS: Add support for OpenGL Core Profile 4.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NSOpenGLProfileVersion4_1Core is available starting with macOS 10.10. Task-number: QTBUG-62333 Change-Id: I75d8c3bc1093ff38c6ca1db2d2da50fd448a149f Reviewed-by: Tor Arne Vestbø --- src/platformsupport/cglconvenience/cglconvenience.mm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/platformsupport/cglconvenience/cglconvenience.mm b/src/platformsupport/cglconvenience/cglconvenience.mm index 85add35879..44238f2273 100644 --- a/src/platformsupport/cglconvenience/cglconvenience.mm +++ b/src/platformsupport/cglconvenience/cglconvenience.mm @@ -81,13 +81,17 @@ void *qcgl_createNSOpenGLPixelFormat(const QSurfaceFormat &format) else if (format.swapBehavior() == QSurfaceFormat::TripleBuffer) attrs.append(NSOpenGLPFATripleBuffer); - if (format.profile() == QSurfaceFormat::CoreProfile - && ((format.majorVersion() == 3 && format.minorVersion() >= 2) - || format.majorVersion() > 3)) { - attrs << NSOpenGLPFAOpenGLProfile; - attrs << NSOpenGLProfileVersion3_2Core; + + // Select OpenGL profile + attrs << NSOpenGLPFAOpenGLProfile; + if (format.profile() == QSurfaceFormat::CoreProfile) { + if (format.version() >= qMakePair(4, 1)) + attrs << NSOpenGLProfileVersion4_1Core; + else if (format.version() >= qMakePair(3, 2)) + attrs << NSOpenGLProfileVersion3_2Core; + else + attrs << NSOpenGLProfileVersionLegacy; } else { - attrs << NSOpenGLPFAOpenGLProfile; attrs << NSOpenGLProfileVersionLegacy; } -- cgit v1.2.3