diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2012-03-02 16:28:16 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-06 06:34:36 +0100 |
| commit | fd57a4059a69cdbefda880a62d949994314fa9ed (patch) | |
| tree | 9a240fa88e2c018693a85e4046e2fff5f7a04d9a /src/quick/items/context2d/qquickcanvasitem.cpp | |
| parent | eab48686b2ec6df8cd179c9472eda4e8c3505cef (diff) | |
Continue refactor of Canvas rendering.
- Remove sync() - not necessary
- Queue buffer before flush
Change-Id: If7dea8e56a612d241c67a82eae265febc45059a8
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Diffstat (limited to 'src/quick/items/context2d/qquickcanvasitem.cpp')
| -rw-r--r-- | src/quick/items/context2d/qquickcanvasitem.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp index 3d520d22e7..3b4adc15ca 100644 --- a/src/quick/items/context2d/qquickcanvasitem.cpp +++ b/src/quick/items/context2d/qquickcanvasitem.cpp @@ -549,8 +549,12 @@ void QQuickCanvasItem::updatePolish() } } - if (d->contextInitialized) - d->context->flush(); + if (d->contextInitialized) { + if (d->renderStrategy == QQuickCanvasItem::Cooperative) + update(); + else + d->context->flush(); + } } QSGNode *QQuickCanvasItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) @@ -566,7 +570,7 @@ QSGNode *QQuickCanvasItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData } if (d->renderStrategy == QQuickCanvasItem::Cooperative) - d->context->sync(); + d->context->flush(); node->setTexture(d->context->texture()); node->setRect(QRectF(QPoint(0, 0), d->canvasWindow.size())); |