Improved QPainter API for allowing native painting in GL / VG.

Previously we were using QPaintEngine::syncState() which is not ideal
naming-wise, since it actually prepares for native painting instead of
syncing the painter's state to native state.

Reviewed-by: Trond

2 files changed, 33 insertions, 33 deletions

diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp
index d2c7b8b93a..09eb646c2b 100644
--- a/src/openvg/qpaintengine_vg.cpp
+++ b/src/openvg/qpaintengine_vg.cpp
@@ -3072,43 +3072,42 @@ void QVGPaintEngine::setState(QPainterState *s)
     }
 }
 
-// Called from QPaintEngine::syncState() to force a state flush.
-// This should be called before and after raw VG operations.
-void QVGPaintEngine::updateState(const QPaintEngineState &state)
+void QVGPaintEngine::beginNativePainting()
 {
-    Q_UNUSED(state);
     Q_D(QVGPaintEngine);
 
-    if (!(d->rawVG)) {
-        // About to enter raw VG mode: flush pending changes and make
-        // sure that all matrices are set to the current transformation.
-        QVGPainterState *s = this->state();
-        d->ensurePen(s->pen);
-        d->ensureBrush(s->brush);
-        d->ensurePathTransform();
-        d->setTransform(VG_MATRIX_IMAGE_USER_TO_SURFACE, d->imageTransform);
+    // About to enter raw VG mode: flush pending changes and make
+    // sure that all matrices are set to the current transformation.
+    QVGPainterState *s = this->state();
+    d->ensurePen(s->pen);
+    d->ensureBrush(s->brush);
+    d->ensurePathTransform();
+    d->setTransform(VG_MATRIX_IMAGE_USER_TO_SURFACE, d->imageTransform);
 #if !defined(QVG_NO_DRAW_GLYPHS)
-        d->setTransform(VG_MATRIX_GLYPH_USER_TO_SURFACE, d->pathTransform);
+    d->setTransform(VG_MATRIX_GLYPH_USER_TO_SURFACE, d->pathTransform);
 #endif
-        d->rawVG = true;
-    } else {
-        // Exiting raw VG mode: force all state values to be
-        // explicitly set on the VG engine to undo any changes
-        // that were made by the raw VG function calls.
-        QPaintEngine::DirtyFlags dirty = d->dirty;
-        d->clearModes();
-        d->forcePenChange = true;
-        d->forceBrushChange = true;
-        d->penType = (VGPaintType)0;
-        d->brushType = (VGPaintType)0;
-        d->clearColor = QColor();
-        d->fillPaint = d->brushPaint;
-        restoreState(QPaintEngine::AllDirty);
-        d->dirty = dirty;
-        d->rawVG = false;
-        vgSetPaint(d->penPaint, VG_STROKE_PATH);
-        vgSetPaint(d->brushPaint, VG_FILL_PATH);
-    }
+    d->rawVG = true;
+}
+
+void QVGPaintEngine::endNativePainting()
+{
+    Q_D(QVGPaintEngine);
+    // Exiting raw VG mode: force all state values to be
+    // explicitly set on the VG engine to undo any changes
+    // that were made by the raw VG function calls.
+    QPaintEngine::DirtyFlags dirty = d->dirty;
+    d->clearModes();
+    d->forcePenChange = true;
+    d->forceBrushChange = true;
+    d->penType = (VGPaintType)0;
+    d->brushType = (VGPaintType)0;
+    d->clearColor = QColor();
+    d->fillPaint = d->brushPaint;
+    restoreState(QPaintEngine::AllDirty);
+    d->dirty = dirty;
+    d->rawVG = false;
+    vgSetPaint(d->penPaint, VG_STROKE_PATH);
+    vgSetPaint(d->brushPaint, VG_FILL_PATH);
 }
 
 QPixmapFilter *QVGPaintEngine::createPixmapFilter(int type) const
diff --git a/src/openvg/qpaintengine_vg_p.h b/src/openvg/qpaintengine_vg_p.h
index 469ec9e659..f0a7838575 100644
--- a/src/openvg/qpaintengine_vg_p.h
+++ b/src/openvg/qpaintengine_vg_p.h
@@ -140,7 +140,8 @@ public:
     QVGPainterState *state() { return static_cast<QVGPainterState *>(QPaintEngineEx::state()); }
     const QVGPainterState *state() const { return static_cast<const QVGPainterState *>(QPaintEngineEx::state()); }
 
-    void updateState(const QPaintEngineState &state);
+    void beginNativePainting();
+    void endNativePainting();
 
     QPixmapFilter *createPixmapFilter(int type) const;