summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2012-12-31 12:56:56 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-02 08:02:33 +0100
commitaa90f78a34bb1b8b0d185504c97b0b5cec5c66da (patch)
tree2f71468b298ee6d2b1b2e196fe99b248b8320923
parentdb25efe78ba347df5056783441582a3039ee77eb (diff)
Fix bug in multisampling handling when converting from surface format
Task-number: QTBUG-28875 Change-Id: If72ce0669de8f344603d2da53eeb5644bd5c4f82 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
-rw-r--r--src/opengl/qgl_qpa.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qgl_qpa.cpp b/src/opengl/qgl_qpa.cpp
index 88736ecdb7..fa94b7cc37 100644
--- a/src/opengl/qgl_qpa.cpp
+++ b/src/opengl/qgl_qpa.cpp
@@ -70,8 +70,8 @@ QGLFormat QGLFormat::fromSurfaceFormat(const QSurfaceFormat &format)
if (format.depthBufferSize() >= 0)
retFormat.setDepthBufferSize(format.depthBufferSize());
if (format.samples() > 1) {
- retFormat.setSampleBuffers(format.samples());
- retFormat.setSamples(true);
+ retFormat.setSampleBuffers(true);
+ retFormat.setSamples(format.samples());
}
if (format.stencilBufferSize() > 0) {
retFormat.setStencil(true);