summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@nokia.com>2011-08-18 08:23:15 +0200
committerMorten Johan Sørvig <morten.sorvig@nokia.com>2011-08-18 10:14:35 +0200
commit6136a792bc54c07dc4cf66481530b79b40110614 (patch)
tree9f7251bde6c89f658b53300677c27419c1fd38c5
parent48ba733fcff6f99d2dd420b44f92ae9ddd1ff264 (diff)
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>
-rw-r--r--src/platformsupport/cglconvenience/cglconvenience.mm3
-rw-r--r--src/plugins/platforms/cocoa/qcocoaglcontext.mm4
2 files changed, 7 insertions, 0 deletions
diff --git a/src/platformsupport/cglconvenience/cglconvenience.mm b/src/platformsupport/cglconvenience/cglconvenience.mm
index 43d955e2b2..6b0354834d 100644
--- 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 e10a50b7c0..c743fcb514 100644
--- 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!