Merge lp:~loic.molinari/qtmir/qtmir-minimize-node-updates into lp:qtmir

[Loïc Molinari]

Optimized CPU usage by removing useless node updates in updatePaintNode().

Optimized CPU usage by removing useless node updates in updatePaintNode().

[Loïc Molinari (loic.molinari)]

Note that this MR requires the multi buffer stream MR [1] from RAOF (with my fixes proposal [2] applied) to be merged.

[1] https://code.launchpad.net/~raof/qtmir/multi-bufferstream-support/+merge/274517
[2] https://code.launchpad.net/~loic.molinari/qtmir/multi-bufferstream-support-fixes

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:397
http://jenkins.qa.ubuntu.com/job/qtmir-ci/546/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/242/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/242/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/124/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/279/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/279/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/124/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/546/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:397
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/9/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/9/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:397
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/133/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1113/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/133/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

397. By Loïc Molinari on 2015-11-03

Minimized node updates.

396. By Loïc Molinari on 2015-11-03

Removed useless texture provider header.

395. By Loïc Molinari on 2015-11-03

Respected project style for function parameters wrapping.

394. By Loïc Molinari on 2015-11-02

Switched back to stretched fill mode.

393. By Loïc Molinari on 2015-11-02

Flattened subtree by removing transform nodes, position now directly set on geometry.

392. By Loïc Molinari on 2015-10-30

Ensured nodes are deleted when shrinking renderables.

391. By Loïc Molinari on 2015-10-27

Avoid iterating the nodes twice when there are new buffers available.

390. By Loïc Molinari on 2015-10-27

Fixed broken rendering in spread mode when AA is enabled.

389. By Loïc Molinari on 2015-10-27

Removed useless markDirty call.

388. By Loïc Molinari on 2015-10-27

Merged lp:qtmir.

=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
--- src/modules/Unity/Application/mirsurface.cpp	2015-11-03 10:20:05 +0000
+++ src/modules/Unity/Application/mirsurface.cpp	2015-11-03 10:20:05 +0000
@@ -713,8 +713,9 @@
 QSGNode *MirSurface::updateSubgraph(QSGNode *root,
                                     float width,
                                     float height,
-                                    bool smooth,
-                                    bool antialiasing)
+                                    QSGTexture::Filtering filtering,
+                                    bool antialiasing,
+                                    DirtyFlags flags)
 {
     QMutexLocker locker(&m_mutex);
 
@@ -729,6 +730,7 @@
 
     if (static_cast<size_t>(root->childCount()) != renderableCount) {
         resizeSubgraph(root, renderableCount);
+        flags = DirtyAll;
     }
 
     if (renderableCount > 0) {
@@ -743,19 +745,25 @@
             if (dirtyBuffers) {
                 node->setBuffer(renderables[i]->buffer());
             }
-
-            // Renderables in the RenderableList are absolutely-positioned, but we want
-            // relative positioning. This seems to be a flaw in the generate_renderables() API.
-            // Note that the geometry is always stretched for now.
-            auto const screenPosition = renderables[i]->screen_position();
-            auto const position = screenPosition.top_left - topLeft;
-            auto const size = screenPosition.size;
-            node->setGeometry(QRectF(position.dx.as_float() * sx, position.dy.as_float() * sy,
-                                     size.width.as_float() * sx, size.height.as_float() * sy));
-
-            node->setFiltering(smooth ? QSGTexture::Linear : QSGTexture::Nearest);
-            node->setAntialiasing(antialiasing);
-            node->update();
+            if (flags & DirtyGeometry) {
+                // Renderables in the RenderableList are absolutely-positioned, but we want
+                // relative positioning. This seems to be a flaw in the generate_renderables() API.
+                // Note that the geometry is always stretched for now.
+                auto const screenPosition = renderables[i]->screen_position();
+                auto const position = screenPosition.top_left - topLeft;
+                auto const size = screenPosition.size;
+                node->setGeometry(QRectF(position.dx.as_float() * sx, position.dy.as_float() * sy,
+                                         size.width.as_float() * sx, size.height.as_float() * sy));
+            }
+            if (flags & DirtyFiltering) {
+                node->setFiltering(filtering);
+            }
+            if (flags & DirtyAntialiasing) {
+                node->setAntialiasing(antialiasing);
+            }
+            if (flags & (DirtyGeometry | DirtyAntialiasing)) {
+                node->update();
+            }
         }
     }
 

=== modified file 'src/modules/Unity/Application/mirsurface.h'
--- src/modules/Unity/Application/mirsurface.h	2015-11-03 10:20:05 +0000
+++ src/modules/Unity/Application/mirsurface.h	2015-11-03 10:20:05 +0000
@@ -87,8 +87,9 @@
     QSGNode *updateSubgraph(QSGNode *root,
             float width,
             float height,
-            bool smooth,
-            bool antialiasing) override;
+            QSGTexture::Filtering filtering,
+            bool antialiasing,
+            DirtyFlags flags) override;
     bool numBuffersReadyForCompositor() override;
     // end of methods called from the rendering (scene graph) thread
 

=== modified file 'src/modules/Unity/Application/mirsurfaceinterface.h'
--- src/modules/Unity/Application/mirsurfaceinterface.h	2015-11-03 10:20:05 +0000
+++ src/modules/Unity/Application/mirsurfaceinterface.h	2015-11-03 10:20:05 +0000
@@ -25,6 +25,7 @@
 // Qt
 #include <QSharedPointer>
 #include <QTouchEvent>
+#include <QtQuick/QSGTexture>
 
 class QHoverEvent;
 class QMouseEvent;
@@ -38,6 +39,13 @@
 {
     Q_OBJECT
 public:
+    enum DirtyFlags {
+        DirtyFiltering    = (1 << 0),
+        DirtyAntialiasing = (1 << 1),
+        DirtyGeometry     = (1 << 2),
+        DirtyAll          = (DirtyFiltering | DirtyAntialiasing | DirtyGeometry)
+    };
+
     MirSurfaceInterface(QObject *parent = nullptr) : unity::shell::application::MirSurfaceInterface(parent) {}
     virtual ~MirSurfaceInterface() {}
 
@@ -53,11 +61,12 @@
     virtual void decrementViewCount() = 0;
 
     // methods called from the rendering (scene graph) thread:
-    virtual QSGNode *updateSubgraph(QSGNode* root,
+    virtual QSGNode *updateSubgraph(QSGNode *root,
             float width,
             float height,
-            bool smooth,
-            bool antialiasing) = 0;
+            QSGTexture::Filtering filtering,
+            bool antialiasing,
+            DirtyFlags flags) = 0;
     virtual bool numBuffersReadyForCompositor() = 0;
     // end of methods called from the rendering (scene graph) thread
 

=== modified file 'src/modules/Unity/Application/mirsurfaceitem.cpp'
--- src/modules/Unity/Application/mirsurfaceitem.cpp	2015-11-03 10:20:05 +0000
+++ src/modules/Unity/Application/mirsurfaceitem.cpp	2015-11-03 10:20:05 +0000
@@ -49,6 +49,7 @@
     , m_surfaceHeight(0)
     , m_orientationAngle(nullptr)
     , m_consumesInput(false)
+    , m_flags(0)
 {
     qCDebug(QTMIR_SURFACES) << "MirSurfaceItem::MirSurfaceItem";
 
@@ -64,6 +65,7 @@
     connect(&m_updateMirSurfaceSizeTimer, &QTimer::timeout, this, &MirSurfaceItem::updateMirSurfaceSize);
 
     connect(this, &QQuickItem::activeFocusChanged, this, &MirSurfaceItem::updateMirSurfaceFocus);
+    connect(this, &QQuickItem::smoothChanged, this, &MirSurfaceItem::onSmoothChanged);
 }
 
 MirSurfaceItem::~MirSurfaceItem()
@@ -132,6 +134,32 @@
     return m_surface && m_surface->live();
 }
 
+void MirSurfaceItem::itemChange(ItemChange change, const ItemChangeData &data)
+{
+    if (change == ItemAntialiasingHasChanged) {
+        m_flags |= DirtyAntialiasing;
+        update();
+    }
+    QQuickItem::itemChange(change, data);
+}
+
+void MirSurfaceItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+{
+    if (newGeometry.width() != oldGeometry.width()
+        || newGeometry.height() != oldGeometry.height()) {
+        m_flags |= DirtyGeometry;
+        update();
+    }
+    QQuickItem::geometryChanged(newGeometry, oldGeometry);
+}
+
+void MirSurfaceItem::onSmoothChanged(bool smooth)
+{
+    Q_UNUSED(smooth);
+    m_flags |= DirtyFiltering;
+    update();
+}
+
 QSGNode *MirSurfaceItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)    // called by render thread
 {
     QMutexLocker mutexLocker(&m_mutex);
@@ -145,7 +173,12 @@
         QTimer::singleShot(0, this, SLOT(update()));
     }
 
-    return m_surface->updateSubgraph(oldNode, width(), height(), smooth(), antialiasing());
+    oldNode = m_surface->updateSubgraph(
+        oldNode, width(), height(), smooth() ? QSGTexture::Linear : QSGTexture::Nearest,
+        antialiasing(), static_cast<MirSurfaceInterface::DirtyFlags>(m_flags));
+    m_flags = 0;
+
+    return oldNode;
 }
 
 void MirSurfaceItem::mousePressEvent(QMouseEvent *event)

=== modified file 'src/modules/Unity/Application/mirsurfaceitem.h'
--- src/modules/Unity/Application/mirsurfaceitem.h	2015-11-03 10:20:05 +0000
+++ src/modules/Unity/Application/mirsurfaceitem.h	2015-11-03 10:20:05 +0000
@@ -93,6 +93,9 @@
 
     void touchEvent(QTouchEvent *event) override;
 
+    void itemChange(ItemChange change, const ItemChangeData &data);
+    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
+
     QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *);
 
 private Q_SLOTS:
@@ -103,7 +106,16 @@
 
     void onActualSurfaceSizeChanged(const QSize &size);
 
+    void onSmoothChanged(bool smooth);
+
 private:
+    enum {
+        // Must be kept in sync with MirSurfaceInterface's dirty flags.
+        DirtyFiltering    = (1 << 0),
+        DirtyAntialiasing = (1 << 1),
+        DirtyGeometry     = (1 << 2)
+    };
+
     bool hasTouchInsideUbuntuKeyboard(const QList<QTouchEvent::TouchPoint> &touchPoints);
     bool isMouseInsideUbuntuKeyboard(const QMouseEvent *event);
 
@@ -146,6 +158,8 @@
     Mir::OrientationAngle *m_orientationAngle;
 
     bool m_consumesInput;
+
+    quint8 m_flags;
 };
 
 } // namespace qtmir