Make Canvas use texture atlas for smallish Image based canvases.

This makes Canvas with Image batchable in the renderer which
means that it is feasible to have 100s of small Canvases in a
scene, for instance as static icons rendered with a bit of
script.

Change-Id: I3ad57360d632b7093fd6993afa88ed35c21d178a
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/quick/items/context2d/qquickcontext2dtexture_p.h b/src/quick/items/context2d/qquickcontext2dtexture_p.h
index 10ac246d1b..3ff0cb12c1 100644
--- a/src/quick/items/context2d/qquickcontext2dtexture_p.h
+++ b/src/quick/items/context2d/qquickcontext2dtexture_p.h
@@ -102,7 +102,7 @@ public:
     bool isOnCustomThread() const { return m_onCustomThread; }
 
     // Called during sync() on the scene graph thread while GUI is blocked.
-    virtual QSGTexture *textureForNextFrame(QSGTexture *lastFrame) = 0;
+    virtual QSGTexture *textureForNextFrame(QSGTexture *lastFrame, QQuickWindow *window) = 0;
     bool event(QEvent *e);
 
     void initializeOpenGL(QOpenGLContext *gl, QOffscreenSurface *s) {
@@ -173,7 +173,7 @@ public:
     virtual void compositeTile(QQuickContext2DTile* tile);
     QSize adjustedTileSize(const QSize &ts);
 
-    QSGTexture *textureForNextFrame(QSGTexture *);
+    QSGTexture *textureForNextFrame(QSGTexture *, QQuickWindow *window);
 
 protected:
     QVector2D scaleFactor() const Q_DECL_OVERRIDE;
@@ -209,7 +209,7 @@ public:
     virtual void endPainting();
     virtual void compositeTile(QQuickContext2DTile* tile);
 
-    virtual QSGTexture *textureForNextFrame(QSGTexture *lastFrame);
+    virtual QSGTexture *textureForNextFrame(QSGTexture *lastFrame, QQuickWindow *window);
 
 public Q_SLOTS:
     virtual void grabImage(const QRectF& region = QRectF());