1 files changed, 21 insertions, 40 deletions

diff --git a/src/opengl/qopenglpaintengine_p.h b/src/opengl/qopenglpaintengine_p.h
index 2548d9db94..40ed7fe609 100644
--- a/src/opengl/qopenglpaintengine_p.h
+++ b/src/opengl/qopenglpaintengine_p.h
@@ -177,7 +177,7 @@ public:
     template<typename T>
     void updateTexture(GLenum textureUnit, const T &texture, GLenum wrapMode, GLenum filterMode, TextureUpdateMode updateMode = UpdateIfNeeded);
     template<typename T>
-    GLuint bindTexture(const T &texture);
+    GLuint bindTexture(const T &texture, bool *newTextureCreated);
     void activateTextureUnit(GLenum textureUnit);
 
     void resetGLState();
@@ -307,51 +307,32 @@ void QOpenGL2PaintEngineExPrivate::uploadData(unsigned int arrayIndex, const GLf
 {
     Q_ASSERT(arrayIndex < 3);
 
-    // If a vertex array object is created we have a profile that supports them
-    // and we will upload the data via a QOpenGLBuffer. Otherwise we will use
-    // the legacy way of uploading the data via glVertexAttribPointer.
-    if (vao.isCreated()) {
-        if (arrayIndex == QT_VERTEX_COORDS_ATTR) {
-            vertexBuffer.bind();
-            vertexBuffer.allocate(data, count * sizeof(float));
-        }
-        if (arrayIndex == QT_TEXTURE_COORDS_ATTR) {
-            texCoordBuffer.bind();
-            texCoordBuffer.allocate(data, count * sizeof(float));
-        }
-        if (arrayIndex == QT_OPACITY_ATTR) {
-            opacityBuffer.bind();
-            opacityBuffer.allocate(data, count * sizeof(float));
-        }
-        if (arrayIndex == QT_OPACITY_ATTR)
-            funcs.glVertexAttribPointer(arrayIndex, 1, GL_FLOAT, GL_FALSE, 0, nullptr);
-        else
-            funcs.glVertexAttribPointer(arrayIndex, 2, GL_FLOAT, GL_FALSE, 0, nullptr);
+    if (arrayIndex == QT_VERTEX_COORDS_ATTR) {
+        vertexBuffer.bind();
+        vertexBuffer.allocate(data, count * sizeof(float));
+    }
+    if (arrayIndex == QT_TEXTURE_COORDS_ATTR) {
+        texCoordBuffer.bind();
+        texCoordBuffer.allocate(data, count * sizeof(float));
+    }
+    if (arrayIndex == QT_OPACITY_ATTR) {
+        opacityBuffer.bind();
+        opacityBuffer.allocate(data, count * sizeof(float));
+
+        funcs.glVertexAttribPointer(arrayIndex, 1, GL_FLOAT, GL_FALSE, 0, nullptr);
     } else {
-        // If we already uploaded the data we don't have to do it again
-        if (data == vertexAttribPointers[arrayIndex])
-            return;
-
-        // Store the data in cache and upload it to the graphics card.
-        vertexAttribPointers[arrayIndex] = data;
-        if (arrayIndex == QT_OPACITY_ATTR)
-            funcs.glVertexAttribPointer(arrayIndex, 1, GL_FLOAT, GL_FALSE, 0, data);
-        else
-            funcs.glVertexAttribPointer(arrayIndex, 2, GL_FLOAT, GL_FALSE, 0, data);
+        funcs.glVertexAttribPointer(arrayIndex, 2, GL_FLOAT, GL_FALSE, 0, nullptr);
     }
 }
 
 bool QOpenGL2PaintEngineExPrivate::uploadIndexData(const void *data, GLenum indexValueType, GLuint count)
 {
-    // Follow the uploadData() logic: VBOs are used only when VAO support is available.
-    // Otherwise the legacy client-side pointer path is used.
-    if (vao.isCreated()) {
-        Q_ASSERT(indexValueType == GL_UNSIGNED_SHORT || indexValueType == GL_UNSIGNED_INT);
-        indexBuffer.bind();
-        indexBuffer.allocate(data, count * (indexValueType == GL_UNSIGNED_SHORT ? sizeof(quint16) : sizeof(quint32)));
-        return true;
-    }
-    return false;
+    Q_ASSERT(indexValueType == GL_UNSIGNED_SHORT || indexValueType == GL_UNSIGNED_INT);
+    indexBuffer.bind();
+    indexBuffer.allocate(
+            data,
+            count * (indexValueType == GL_UNSIGNED_SHORT ? sizeof(quint16) : sizeof(quint32)));
+    return true;
 }
 
 QT_END_NAMESPACE