From 0ce52668616eba11de6c8255ec5319db3405483a Mon Sep 17 00:00:00 2001 From: mread Date: Tue, 10 Jan 2012 16:20:18 +0000 Subject: Using samples=0 to turn multisampling off MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change 54613aec was using the value 1 for QGLFormat::samples when it wanted multisampling off. But this was actually resulting in multisampling being turned on. It should have been using 0, which it now does. Task-number: ou1cimx1#951223 Change-Id: Ie68367f083f7ab4bae4143a59996c71add3e5c06 Reviewed-by: Pasi Pentikäinen --- src/opengl/qgl_egl.cpp | 2 +- src/opengl/qgl_symbian.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/opengl/qgl_egl.cpp b/src/opengl/qgl_egl.cpp index 38f7fda..b373346 100644 --- a/src/opengl/qgl_egl.cpp +++ b/src/opengl/qgl_egl.cpp @@ -81,7 +81,7 @@ void qt_eglproperties_set_glformat(QEglProperties& eglProperties, const QGLForma alphaSize = alphaSize > 0 ? alphaSize : 8; depthSize = depthSize > 0 ? depthSize : 24; stencilSize = stencilSize > 0 ? stencilSize : 8; - sampleCount = sampleCount > 0 ? sampleCount : 4; + sampleCount = sampleCount >= 0 ? sampleCount : 4; #else // QGLFormat uses a magic value of -1 to indicate "don't care", even when a buffer of that // type has been requested. So we must check QGLFormat's booleans too if size is -1: diff --git a/src/opengl/qgl_symbian.cpp b/src/opengl/qgl_symbian.cpp index f2535d5..91f46b9 100644 --- a/src/opengl/qgl_symbian.cpp +++ b/src/opengl/qgl_symbian.cpp @@ -192,7 +192,7 @@ bool QGLContext::chooseContext(const QGLContext* shareContext) // almost same as d->glFormat.setSamples(4); } else { d->glFormat.setSampleBuffers(0); - d->glFormat.setSamples(1); + d->glFormat.setSamples(0); } } -- cgit v0.12