diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-08-09 11:40:53 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-08-09 11:40:53 (GMT) |
| commit | 3cfbab2df3962ac76f76aab4e3dd61c9ee55d4d5 (patch) | |
| tree | 54c9ad5f557751ca5eca1ea551bff9908217eded | |
| parent | 7d39a66fe88c039876285b21b592de20cf2e78ed (diff) | |
| parent | 24742e54332a71db0bc5ae7b1632924ae592aea7 (diff) | |
| download | Qt-3cfbab2df3962ac76f76aab4e3dd61c9ee55d4d5.zip Qt-3cfbab2df3962ac76f76aab4e3dd61c9ee55d4d5.tar.gz Qt-3cfbab2df3962ac76f76aab4e3dd61c9ee55d4d5.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
| -rw-r--r-- | src/opengl/qglframebufferobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp index deffc20..9b8a3d1 100644 --- a/src/opengl/qglframebufferobject.cpp +++ b/src/opengl/qglframebufferobject.cpp @@ -445,11 +445,11 @@ void QGLFramebufferObjectPrivate::init(QGLFramebufferObject *q, const QSize &sz, GLint maxSamples; glGetIntegerv(GL_MAX_SAMPLES_EXT, &maxSamples); - samples = qBound(1, int(samples), int(maxSamples)); + samples = qBound(0, int(samples), int(maxSamples)); glGenRenderbuffers(1, &color_buffer); glBindRenderbuffer(GL_RENDERBUFFER_EXT, color_buffer); - if (glRenderbufferStorageMultisampleEXT) { + if (glRenderbufferStorageMultisampleEXT && samples > 0) { glRenderbufferStorageMultisampleEXT(GL_RENDERBUFFER_EXT, samples, internal_format, size.width(), size.height()); } else { |