1 files changed, 27 insertions, 24 deletions

diff --git a/src/opengl/qopenglpaintengine.cpp b/src/opengl/qopenglpaintengine.cpp
index 2556881e12..c8a0bf7b50 100644
--- a/src/opengl/qopenglpaintengine.cpp
+++ b/src/opengl/qopenglpaintengine.cpp
@@ -726,11 +726,11 @@ void QOpenGL2PaintEngineExPrivate::resetGLState()
         float color[] = { 1.0f, 1.0f, 1.0f, 1.0f };
         funcs.glVertexAttrib4fv(3, color);
     }
-    if (vao.isCreated()) {
+    if (vao.isCreated())
         vao.release();
-        funcs.glBindBuffer(GL_ARRAY_BUFFER, 0);
-        funcs.glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-    }
+
+    funcs.glBindBuffer(GL_ARRAY_BUFFER, 0);
+    funcs.glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
 }
 
 void QOpenGL2PaintEngineEx::endNativePainting()
@@ -2132,6 +2132,10 @@ void QOpenGL2PaintEngineExPrivate::drawPixmapFragments(const QPainter::PixmapFra
 
     transferMode(ImageOpacityArrayDrawingMode);
 
+    uploadData(QT_VERTEX_COORDS_ATTR, (GLfloat*)vertexCoordinateArray.data(), vertexCoordinateArray.vertexCount() * 2);
+    uploadData(QT_TEXTURE_COORDS_ATTR, (GLfloat*)textureCoordinateArray.data(), textureCoordinateArray.vertexCount() * 2);
+    uploadData(QT_OPACITY_ATTR, (GLfloat*)opacityArray.data(), opacityArray.size());
+
     GLenum filterMode = q->state()->renderHints & QPainter::SmoothPixmapTransform ? GL_LINEAR : GL_NEAREST;
     updateTexture(QT_IMAGE_TEXTURE_UNIT, pixmap, GL_CLAMP_TO_EDGE, filterMode);
 
@@ -2198,28 +2202,27 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev)
         bool created = d->vao.create();
 
         // If we managed to create it then we have a profile that supports VAOs
-        if (created) {
+        if (created)
             d->vao.bind();
+    }
 
-            // Generate a new Vertex Buffer Object if we don't have one already
-            if (!d->vertexBuffer.isCreated()) {
-                d->vertexBuffer.create();
-                // Set its usage to StreamDraw, we will use this buffer only a few times before refilling it
-                d->vertexBuffer.setUsagePattern(QOpenGLBuffer::StreamDraw);
-            }
-            if (!d->texCoordBuffer.isCreated()) {
-                d->texCoordBuffer.create();
-                d->texCoordBuffer.setUsagePattern(QOpenGLBuffer::StreamDraw);
-            }
-            if (!d->opacityBuffer.isCreated()) {
-                d->opacityBuffer.create();
-                d->opacityBuffer.setUsagePattern(QOpenGLBuffer::StreamDraw);
-            }
-            if (!d->indexBuffer.isCreated()) {
-                d->indexBuffer.create();
-                d->indexBuffer.setUsagePattern(QOpenGLBuffer::StreamDraw);
-            }
-        }
+    // Generate a new Vertex Buffer Object if we don't have one already
+    if (!d->vertexBuffer.isCreated()) {
+        d->vertexBuffer.create();
+        // Set its usage to StreamDraw, we will use this buffer only a few times before refilling it
+        d->vertexBuffer.setUsagePattern(QOpenGLBuffer::StreamDraw);
+    }
+    if (!d->texCoordBuffer.isCreated()) {
+        d->texCoordBuffer.create();
+        d->texCoordBuffer.setUsagePattern(QOpenGLBuffer::StreamDraw);
+    }
+    if (!d->opacityBuffer.isCreated()) {
+        d->opacityBuffer.create();
+        d->opacityBuffer.setUsagePattern(QOpenGLBuffer::StreamDraw);
+    }
+    if (!d->indexBuffer.isCreated()) {
+        d->indexBuffer.create();
+        d->indexBuffer.setUsagePattern(QOpenGLBuffer::StreamDraw);
     }
 
     for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i)