Enable multisampling and swap interval by default on cocoa

Change-Id: If3d1939e6196f5aa6654645d20dab7ad251046fa
Reviewed-on: http://codereview.qt.nokia.com/3138
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>

diff --git a/src/platformsupport/cglconvenience/cglconvenience.mm b/src/platformsupport/cglconvenience/cglconvenience.mm
index 43d955e..6b03548 100644 (file)
--- a/src/platformsupport/cglconvenience/cglconvenience.mm
+++ b/src/platformsupport/cglconvenience/cglconvenience.mm
@@ -87,6 +87,9 @@ void *qcgl_createNSOpenGLPixelFormat()
     {
         NSOpenGLPFADoubleBuffer,
         NSOpenGLPFADepthSize, 32,
+        NSOpenGLPFAMultisample,
+        NSOpenGLPFASampleBuffers, (NSOpenGLPixelFormatAttribute)1,
+        NSOpenGLPFASamples, (NSOpenGLPixelFormatAttribute) 8,
         0
     };
 

diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.mm b/src/plugins/platforms/cocoa/qcocoaglcontext.mm
index e10a50b..c743fcb 100644 (file)
--- a/src/plugins/platforms/cocoa/qcocoaglcontext.mm
+++ b/src/plugins/platforms/cocoa/qcocoaglcontext.mm
@@ -17,6 +17,10 @@ QCocoaGLContext::QCocoaGLContext(const QSurfaceFormat &format, QPlatformGLContex
 
     m_context = [NSOpenGLContext alloc];
     [m_context initWithFormat:pixelFormat shareContext:actualShare];
+
+    const GLint interval = 1;
+    [m_context setValues:&interval forParameter:NSOpenGLCPSwapInterval];
+
 }
 
 // Match up with createNSOpenGLPixelFormat!