Merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-update-shadereffectsource-based-shapes into lp:ubuntu-ui-toolkit/staging

[Loïc Molinari]

[UbuntuShape] Ensured QSGLayer-based source textures (like ShaderEffectSource) are updated before rendering.

[UbuntuShape] Ensured QSGLayer-based source textures (like ShaderEffectSource) are updated before rendering.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1495
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1699/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2409
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/427
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/429
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/429/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/426
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2099
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2407
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2407/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19866

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1699/rebuild

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

works fine, thanks.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/921/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/229
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/228
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/228/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/228

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/plugin/ucubuntushape.cpp'
--- modules/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-04-22 20:51:37 +0000
+++ modules/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-04-23 08:32:05 +0000
@@ -34,6 +34,7 @@
 #include <QtQuick/QQuickWindow>
 #include <QtQuick/QSGTextureProvider>
 #include <QtQuick/private/qquickimage_p.h>
+#include <QtQuick/private/qsgadaptationlayer_p.h>
 #include <math.h>
 
 // Anti-aliasing distance of the contour in pixels.
@@ -208,6 +209,15 @@
         | (m_data.flags & ShapeMaterial::Data::Repeated);
 }
 
+void ShapeMaterial::updateTextures()
+{
+    if (m_data.flags & ShapeMaterial::Data::Textured && m_data.sourceTextureProvider) {
+        if (QSGLayer* texture = qobject_cast<QSGLayer*>(m_data.sourceTextureProvider->texture())) {
+            texture->updateTexture();
+        }
+    }
+}
+
 // --- Scene graph node ---
 
 ShapeNode::ShapeNode()
@@ -215,6 +225,7 @@
     , m_material()
     , m_geometry(attributeSet(), vertexCount, indexCount, indexType)
 {
+    QSGNode::setFlag(UsePreprocess, true);
     memcpy(m_geometry.indexData(), indices(), indexCount * indexTypeSize);
     m_geometry.setDrawingMode(drawingMode);
     m_geometry.setIndexDataPattern(indexDataPattern);

=== modified file 'modules/Ubuntu/Components/plugin/ucubuntushape.h'
--- modules/Ubuntu/Components/plugin/ucubuntushape.h	2015-04-14 21:50:54 +0000
+++ modules/Ubuntu/Components/plugin/ucubuntushape.h	2015-04-23 08:32:05 +0000
@@ -75,6 +75,7 @@
     virtual QSGMaterialType* type() const;
     virtual QSGMaterialShader* createShader() const;
     virtual int compare(const QSGMaterial* other) const;
+    virtual void updateTextures();
     const Data* constData() const { return &m_data; }
     Data* data() { return &m_data; }
 
@@ -107,6 +108,7 @@
     ShapeNode();
     ShapeMaterial* material() { return &m_material; }
     QSGGeometry* geometry() { return &m_geometry; }
+    void preprocess() { m_material.updateTextures(); }
 
 private:
     ShapeMaterial m_material;

=== modified file 'modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp'
--- modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp	2015-04-22 20:51:37 +0000
+++ modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp	2015-04-23 08:32:05 +0000
@@ -60,6 +60,7 @@
     , m_geometry(attributeSet(), ShapeNode::vertexCount, ShapeNode::indexCount,
                  ShapeNode::indexType)
 {
+    QSGNode::setFlag(UsePreprocess, true);
     memcpy(m_geometry.indexData(), ShapeNode::indices(),
            ShapeNode::indexCount * ShapeNode::indexTypeSize);
     m_geometry.setDrawingMode(ShapeNode::drawingMode);

=== modified file 'modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.h'
--- modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.h	2015-03-10 18:49:20 +0000
+++ modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.h	2015-04-23 08:32:05 +0000
@@ -57,6 +57,7 @@
 
     ShapeOverlayNode();
     QSGGeometry* geometry() { return &m_geometry; }
+    void preprocess() { m_material.updateTextures(); }
 
 private:
     ShapeOverlayMaterial m_material;

=== added file 'tests/resources/ubuntushape/AnimatedShaderEffectSource.qml'
--- tests/resources/ubuntushape/AnimatedShaderEffectSource.qml	1970-01-01 00:00:00 +0000
+++ tests/resources/ubuntushape/AnimatedShaderEffectSource.qml	2015-04-23 08:32:05 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Test if the UbuntuShape is correctly updated when its source is a ShaderEffectSource.
+
+import QtQuick 2.4
+import Ubuntu.Components 1.2
+
+Rectangle {
+    id: root
+    width: 300
+    height: 150
+    color: "#c0c0c0"
+
+    Text {
+        id: text
+        anchors.centerIn: parent
+        font.family: "Ubuntu"
+        font.pixelSize: 34
+        color: "#c0c0c0"
+        text: "This is a scrolling text... "
+        font.bold: true
+    }
+
+    ShaderEffectSource {
+        id: effectSource
+        sourceItem: text
+        hideSource: true
+        visible: false
+    }
+
+    UbuntuShape {
+        id: shape
+        anchors.fill: parent
+        anchors.margins: 50
+        backgroundColor: "black"
+        radius: "medium"
+        source: effectSource
+        sourceFillMode: UbuntuShape.Pad
+        sourceHorizontalAlignment: UbuntuShape.AlignLeft
+        sourceHorizontalWrapMode: UbuntuShape.Repeat
+
+        PropertyAnimation on sourceTranslation {
+            from: Qt.vector2d(0.0, 0.0)
+            to: Qt.vector2d(-text.width / shape.width, 0.0)
+            loops: Animation.Infinite
+            duration: 2500
+        }
+    }
+}