diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2010-08-09 11:57:14 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2010-08-09 11:57:14 (GMT) |
| commit | 662f87ad52ea75229ce18b19983890425cc45298 (patch) | |
| tree | 67b1764083e54f017e0d318c63c152af40307ad9 /src/opengl | |
| parent | eea84818e98af917d3cf2bf04ea17a416ef9d55e (diff) | |
| parent | 7829343dc9e12befd6c471cc72d00139bad5d42b (diff) | |
| download | Qt-662f87ad52ea75229ce18b19983890425cc45298.zip Qt-662f87ad52ea75229ce18b19983890425cc45298.tar.gz Qt-662f87ad52ea75229ce18b19983890425cc45298.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/opengl')
| -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 { |