Merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-batched-renderer-support-for-ubuntushape2 into lp:ubuntu-ui-toolkit/staging

[Loïc Molinari]

[UbuntuShape] Implemented QSGMaterial::compare() methods so that shapes can be batched.

[UbuntuShape] Implemented QSGMaterial::compare() methods so that shapes can be batched.

[Loïc Molinari (loic.molinari)]

Resubmitted with staging merge.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1178
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/709/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2940
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2328
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/541
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/541
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/541/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/541
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3001
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4183
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4183/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10888
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1928
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2594
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2594/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/plugin/shapeitem.cpp'
--- modules/Ubuntu/Components/plugin/shapeitem.cpp	2014-08-01 19:45:43 +0000
+++ modules/Ubuntu/Components/plugin/shapeitem.cpp	2014-08-01 22:28:00 +0000
@@ -702,6 +702,17 @@
     return new ShapeTexturedShader;
 }
 
+int ShapeTexturedMaterial::compare(const QSGMaterial* other) const
+{
+    const ShapeTexturedMaterial* otherMaterial = static_cast<const ShapeTexturedMaterial*>(other);
+    const QSGTextureProvider* otherTextureProvider = otherMaterial->imageTextureProvider();
+    const QSGTexture* otherTexture = otherTextureProvider ? otherTextureProvider->texture() : NULL;
+    const int otherTextureId = otherTexture ? otherTexture->textureId() : 0;
+    const QSGTexture* texture = imageTextureProvider_ ? imageTextureProvider_->texture() : NULL;
+    const int textureId = texture ? texture->textureId() : 0;
+    return textureId - otherTextureId;
+}
+
 void ShapeTexturedMaterial::setImage(QQuickItem* image)
 {
     imageTextureProvider_ = image ? image->textureProvider() : NULL;
@@ -803,6 +814,16 @@
     return new ShapeColoredShader;
 }
 
+int ShapeColoredMaterial::compare(const QSGMaterial* other) const
+{
+    const ShapeColoredMaterial* otherMaterial = static_cast<const ShapeColoredMaterial*>(other);
+    if ((color_ != otherMaterial->color()) || (gradientColor_ != otherMaterial->gradientColor())) {
+        return -1;
+    } else {
+        return 0;
+    }
+}
+
 void ShapeColoredMaterial::setColor(const QColor& color)
 {
     // Premultiply color components by alpha.

=== modified file 'modules/Ubuntu/Components/plugin/shapeitem.h'
--- modules/Ubuntu/Components/plugin/shapeitem.h	2014-08-01 19:45:43 +0000
+++ modules/Ubuntu/Components/plugin/shapeitem.h	2014-08-01 22:28:00 +0000
@@ -146,6 +146,7 @@
     ShapeTexturedMaterial();
     virtual QSGMaterialType* type() const;
     virtual QSGMaterialShader* createShader() const;
+    virtual int compare(const QSGMaterial* other) const;
     QSGTextureProvider* imageTextureProvider() const;
     void setImage(QQuickItem* image);
     QSGTexture* shapeTexture() const { return shapeTexture_; }
@@ -185,6 +186,7 @@
     ShapeColoredMaterial();
     virtual QSGMaterialType* type() const;
     virtual QSGMaterialShader* createShader() const;
+    virtual int compare(const QSGMaterial* other) const;
     const QVector4D& color() const { return color_; }
     void setColor(const QColor& color);
     const QVector4D& gradientColor() const { return gradientColor_; }