summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authormread <qt-info@nokia.com>2012-01-10 16:20:18 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-01-13 19:50:49 (GMT)
commit0ce52668616eba11de6c8255ec5319db3405483a (patch)
treefee215fd28d354482ba9b2f467a867e5d8876fa1 /src/opengl
parent8a2c25945e8458a0b8582ad0860d08e3572170f4 (diff)
downloadQt-0ce52668616eba11de6c8255ec5319db3405483a.zip
Qt-0ce52668616eba11de6c8255ec5319db3405483a.tar.gz
Qt-0ce52668616eba11de6c8255ec5319db3405483a.tar.bz2
Using samples=0 to turn multisampling off
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 <ext-pasi.a.pentikainen@nokia.com>
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/qgl_egl.cpp2
-rw-r--r--src/opengl/qgl_symbian.cpp2
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);
}
}