Corrected the size of mipmaps in framebuffer objects.

Change-Id: Ia3c0daefc6537b12be7f9072e7defc0631794690
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp
index aac6ea0..0eb264b 100644 (file)
--- a/src/gui/opengl/qopenglframebufferobject.cpp
+++ b/src/gui/opengl/qopenglframebufferobject.cpp
@@ -414,8 +414,8 @@ void QOpenGLFramebufferObjectPrivate::init(QOpenGLFramebufferObject *, const QSi
             int height = size.height();
             int level = 0;
             while (width > 1 || height > 1) {
-                width = (width + 1) >> 1;
-                height = (height + 1) >> 1;
+                width = qMax(1, width >> 1);
+                height = qMax(1, height >> 1);
                 ++level;
                 glTexImage2D(target, level, internal_format, width, height, 0,
                         GL_RGBA, GL_UNSIGNED_BYTE, NULL);

diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp
index 96479e1..21b3abf 100644 (file)
--- a/src/opengl/qglframebufferobject.cpp
+++ b/src/opengl/qglframebufferobject.cpp
@@ -459,8 +459,8 @@ void QGLFramebufferObjectPrivate::init(QGLFramebufferObject *q, const QSize &sz,
             int height = size.height();
             int level = 0;
             while (width > 1 || height > 1) {
-                width = (width + 1) >> 1;
-                height = (height + 1) >> 1;
+                width = qMax(1, width >> 1);
+                height = qMax(1, height >> 1);
                 ++level;
                 glTexImage2D(target, level, internal_format, width, height, 0,
                         GL_RGBA, GL_UNSIGNED_BYTE, NULL);