2 files changed, 22 insertions, 2 deletions

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 78c4b23665..dd3b6ee2d3 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -223,11 +223,19 @@ void QGL2PaintEngineExPrivate::updateBrushTexture()
         if (currentBrushPixmap.width() > max_texture_size || currentBrushPixmap.height() > max_texture_size)
             currentBrushPixmap = currentBrushPixmap.scaled(max_texture_size, max_texture_size, Qt::KeepAspectRatio);
 
+        GLuint wrapMode = GL_REPEAT;
+        if (ctx->contextHandle()->isES()) {
+            // OpenGL ES does not support GL_REPEAT wrap modes for NPOT textures. So instead,
+            // we emulate GL_REPEAT by only taking the fractional part of the texture coords
+            // in the qopenglslTextureBrushSrcFragmentShader program.
+            wrapMode = GL_CLAMP_TO_EDGE;
+        }
+
         funcs.glActiveTexture(GL_TEXTURE0 + QT_BRUSH_TEXTURE_UNIT);
         QGLTexture *tex = ctx->d_func()->bindTexture(currentBrushPixmap, GL_TEXTURE_2D, GL_RGBA,
                                                      QGLContext::InternalBindOption |
                                                      QGLContext::CanFlipNativePixmapBindOption);
-        updateTextureFilter(GL_TEXTURE_2D, GL_REPEAT, q->state()->renderHints & QPainter::SmoothPixmapTransform);
+        updateTextureFilter(GL_TEXTURE_2D, wrapMode, q->state()->renderHints & QPainter::SmoothPixmapTransform);
         textureInvertedY = tex->options & QGLContext::InvertedYBindOption ? -1 : 1;
     }
     brushTextureDirty = false;
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index ae70072c4d..02ea6e45e3 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -2497,7 +2497,19 @@ QGLTexture *QGLContextPrivate::bindTexture(const QPixmap &pixmap, GLenum target,
     }
 
     if (!texture) {
-        QImage image = pixmap.toImage();
+        QImage image;
+        QPaintEngine* paintEngine = pixmap.paintEngine();
+        if (!paintEngine || paintEngine->type() != QPaintEngine::Raster)
+            image = pixmap.toImage();
+        else {
+            // QRasterPixmapData::toImage() will deep-copy the backing QImage if there's an active QPainter on it.
+            // For performance reasons, we don't want that here, so we temporarily redirect the paint engine.
+            QPaintDevice* currentPaintDevice = paintEngine->paintDevice();
+            paintEngine->setPaintDevice(0);
+            image = pixmap.toImage();
+            paintEngine->setPaintDevice(currentPaintDevice);
+        }
+
         // If the system depth is 16 and the pixmap doesn't have an alpha channel
         // then we convert it to RGB16 in the hope that it gets uploaded as a 16
         // bit texture which is much faster to access than a 32-bit one.