Introduce BorderImageMesh.

BorderImageMesh provides an optimized way to use BorderImage-type
images with ShaderEffect.

[ChangeLog][QtQuick][ShaderEffect] Add new mesh type BorderImageMesh.
BorderImageMesh provides an optimized way to use BorderImage-type
images with ShaderEffect.

Change-Id: I73bdc8318a0facba6edc2634b5f4614996b39c1b
Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>

4 files changed, 51 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickborderimage/data/mesh.qml b/tests/auto/quick/qquickborderimage/data/mesh.qml
new file mode 100644
index 0000000000..203bf25867
--- /dev/null
+++ b/tests/auto/quick/qquickborderimage/data/mesh.qml
@@ -0,0 +1,22 @@
+import QtQuick 2.8
+
+Item {
+    width: 300
+    height: 300
+    Image {
+        id: image
+        source: "colors.png"
+        visible: false
+    }
+    ShaderEffect {
+        anchors.fill: parent
+        property variant source: image
+        mesh: BorderImageMesh {
+            border.left: 30
+            border.right: 30
+            border.top: 30
+            border.bottom: 30
+            size: image.sourceSize
+        }
+    }
+}
diff --git a/tests/auto/quick/qquickborderimage/data/nonmesh.qml b/tests/auto/quick/qquickborderimage/data/nonmesh.qml
new file mode 100644
index 0000000000..7a1830a942
--- /dev/null
+++ b/tests/auto/quick/qquickborderimage/data/nonmesh.qml
@@ -0,0 +1,11 @@
+import QtQuick 2.8
+
+BorderImage {
+    width: 300
+    height: 300
+    source: "colors.png"
+    border.left: 30
+    border.right: 30
+    border.top: 30
+    border.bottom: 30
+}
diff --git a/tests/auto/quick/qquickborderimage/qquickborderimage.pro b/tests/auto/quick/qquickborderimage/qquickborderimage.pro
index 3e16063559..ba6c01737a 100644
--- a/tests/auto/quick/qquickborderimage/qquickborderimage.pro
+++ b/tests/auto/quick/qquickborderimage/qquickborderimage.pro
@@ -7,6 +7,7 @@ SOURCES += tst_qquickborderimage.cpp \
            ../../shared/testhttpserver.cpp
 
 include (../../shared/util.pri)
+include (../shared/util.pri)
 
 TESTDATA = data/*
 
diff --git a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp
index c11ae1e8c9..e1435e739f 100644
--- a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp
+++ b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp
@@ -44,6 +44,7 @@
 
 #include "../../shared/testhttpserver.h"
 #include "../../shared/util.h"
+#include "../shared/visualtestutil.h"
 
 Q_DECLARE_METATYPE(QQuickImageBase::Status)
 
@@ -75,6 +76,7 @@ private slots:
     void statusChanges_data();
     void sourceSizeChanges();
     void progressAndStatusChanges();
+    void borderImageMesh();
 
 private:
     QQmlEngine engine;
@@ -575,6 +577,21 @@ void tst_qquickborderimage::progressAndStatusChanges()
     delete obj;
 }
 
+void tst_qquickborderimage::borderImageMesh()
+{
+    QQuickView *window = new QQuickView;
+
+    window->setSource(testFileUrl("nonmesh.qml"));
+    window->show();
+    QTest::qWaitForWindowExposed(window);
+    QImage nonmesh = window->grabWindow();
+
+    window->setSource(testFileUrl("mesh.qml"));
+    QImage mesh = window->grabWindow();
+
+    QVERIFY(QQuickVisualTestUtil::compareImages(mesh, nonmesh));
+}
+
 QTEST_MAIN(tst_qquickborderimage)
 
 #include "tst_qquickborderimage.moc"