D3D12: Fix Animators with non-GL backends

Add a test for render thread Animators.

Change-Id: Iddb11f734ccec00d76ca99cd8349cbb65750e784
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>

6 files changed, 204 insertions, 1 deletions

diff --git a/tests/manual/nodetypes/Animators.qml b/tests/manual/nodetypes/Animators.qml
new file mode 100644
index 0000000000..7d8baf1cb8
--- /dev/null
+++ b/tests/manual/nodetypes/Animators.qml
@@ -0,0 +1,180 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.5
+
+Item {
+    id: window
+
+    Rectangle {
+        anchors.fill: parent
+        gradient: Gradient {
+            GradientStop { position: 0.0; color: "#14148c" }
+            GradientStop { position: 0.499; color: "#14aaff" }
+            GradientStop { position: 0.5; color: "#80c342" }
+            GradientStop { position: 1.0; color: "#006325" }
+        }
+    }
+
+    SequentialAnimation {
+        id: plainAnim
+        SequentialAnimation {
+            ParallelAnimation {
+                PropertyAnimation {
+                    property: "y"
+                    target: smiley
+                    from: smiley.minHeight
+                    to: smiley.maxHeight
+                    easing.type: Easing.OutExpo
+                    duration: 300
+                }
+                PropertyAnimation {
+                    property: "scale"
+                    target: shadow
+                    from: 1
+                    to: 0.5
+                    easing.type: Easing.OutExpo
+                    duration: 300
+                }
+            }
+            ParallelAnimation {
+                PropertyAnimation {
+                    property: "y"
+                    target: smiley
+                    from: smiley.maxHeight
+                    to: smiley.minHeight
+                    easing.type: Easing.OutBounce
+                    duration: 1000
+                }
+                PropertyAnimation {
+                    property: "scale"
+                    target: shadow
+                    from: 0.5
+                    to: 1
+                    easing.type: Easing.OutBounce
+                    duration: 1000
+                }
+            }
+        }
+        running: false
+    }
+
+    SequentialAnimation {
+        id: renderThreadAnim
+        SequentialAnimation {
+            ParallelAnimation {
+                YAnimator {
+                    target: smiley
+                    from: smiley.minHeight
+                    to: smiley.maxHeight
+                    easing.type: Easing.OutExpo
+                    duration: 300
+                }
+                ScaleAnimator {
+                    target: shadow
+                    from: 1
+                    to: 0.5
+                    easing.type: Easing.OutExpo
+                    duration: 300
+                }
+            }
+            ParallelAnimation {
+                YAnimator {
+                    target: smiley
+                    from: smiley.maxHeight
+                    to: smiley.minHeight
+                    easing.type: Easing.OutBounce
+                    duration: 1000
+                }
+                ScaleAnimator {
+                    target: shadow
+                    from: 0.5
+                    to: 1
+                    easing.type: Easing.OutBounce
+                    duration: 1000
+                }
+            }
+        }
+        running: false
+    }
+
+    Image {
+        id: shadow
+        anchors.horizontalCenter: parent.horizontalCenter
+        y: smiley.minHeight + smiley.height
+        source: "qrc:/shadow.png"
+    }
+
+    Image {
+        id: smiley
+        property int maxHeight: window.height / 3
+        property int minHeight: 2 * window.height / 3
+
+        anchors.horizontalCenter: parent.horizontalCenter
+        y: minHeight
+        source: "qrc:/face-smile.png"
+    }
+
+    Text {
+        text: "click left for plain animation, right for render thread Animators, middle to sleep for 2 sec on the main (gui) thread"
+        color: "white"
+    }
+
+    Text {
+        text: plainAnim.running ? "NORMAL ANIMATION" : (renderThreadAnim.running ? "RENDER THREAD ANIMATION" : "NO ANIMATION")
+        color: "red"
+        font.pointSize: 20
+        anchors.bottom: parent.bottom
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        acceptedButtons: Qt.AllButtons
+        onClicked: if (mouse.button === Qt.LeftButton) {
+                       renderThreadAnim.running = false;
+                       plainAnim.running = true;
+                   } else if (mouse.button === Qt.RightButton) {
+                       plainAnim.running = false;
+                       renderThreadAnim.running = true;
+                   } else if (mouse.button === Qt.MiddleButton) {
+                       helper.sleep(2000);
+                   }
+    }
+}
diff --git a/tests/manual/nodetypes/main.qml b/tests/manual/nodetypes/main.qml
index 234b27c144..b083bcc648 100644
--- a/tests/manual/nodetypes/main.qml
+++ b/tests/manual/nodetypes/main.qml
@@ -62,5 +62,8 @@ Item {
 
         if (event.key === Qt.Key_T)
             loader.source = "qrc:/Text.qml";
+
+        if (event.key === Qt.Key_A)
+            loader.source = "qrc:/Animators.qml";
     }
 }
diff --git a/tests/manual/nodetypes/nodetypes.cpp b/tests/manual/nodetypes/nodetypes.cpp
index 80753de766..c5b46a3317 100644
--- a/tests/manual/nodetypes/nodetypes.cpp
+++ b/tests/manual/nodetypes/nodetypes.cpp
@@ -39,7 +39,20 @@
 ****************************************************************************/
 
 #include <QGuiApplication>
+#include <QThread>
 #include <QQuickView>
+#include <QQmlEngine>
+#include <QQmlContext>
+
+class Helper : public QObject
+{
+    Q_OBJECT
+
+public:
+    Q_INVOKABLE void sleep(int ms) {
+        QThread::msleep(ms);
+    }
+};
 
 int main(int argc, char **argv)
 {
@@ -52,9 +65,12 @@ int main(int argc, char **argv)
     qDebug("  [4] - A lot of rectangles (perf)");
     qDebug("  [I] - Images");
     qDebug("  [T] - Text");
+    qDebug("  [A] - Render thread Animator");
     qDebug("\nPress S to stop the currently running test\n");
 
+    Helper helper;
     QQuickView view;
+    view.engine()->rootContext()->setContextProperty(QLatin1String("helper"), &helper);
     view.setResizeMode(QQuickView::SizeRootObjectToView);
     view.resize(1024, 768);
     view.setSource(QUrl("qrc:/main.qml"));
@@ -62,3 +78,5 @@ int main(int argc, char **argv)
 
     return app.exec();
 }
+
+#include "nodetypes.moc"
diff --git a/tests/manual/nodetypes/nodetypes.pro b/tests/manual/nodetypes/nodetypes.pro
index 3efcc7b713..713c48064f 100644
--- a/tests/manual/nodetypes/nodetypes.pro
+++ b/tests/manual/nodetypes/nodetypes.pro
@@ -4,4 +4,4 @@ SOURCES += nodetypes.cpp
 
 RESOURCES += nodetypes.qrc
 
-OTHER_FILES += main.qml Rects.qml LotsOfRects.qml Images.qml Text.qml
+OTHER_FILES += main.qml Rects.qml LotsOfRects.qml Images.qml Text.qml Animators.qml
diff --git a/tests/manual/nodetypes/nodetypes.qrc b/tests/manual/nodetypes/nodetypes.qrc
index a4f78851fe..2f1f2a2bbc 100644
--- a/tests/manual/nodetypes/nodetypes.qrc
+++ b/tests/manual/nodetypes/nodetypes.qrc
@@ -5,7 +5,9 @@
         <file>LotsOfRects.qml</file>
         <file>Images.qml</file>
         <file>Text.qml</file>
+        <file>Animators.qml</file>
         <file>qt.png</file>
         <file>face-smile.png</file>
+        <file>shadow.png</file>
     </qresource>
 </RCC>
diff --git a/tests/manual/nodetypes/shadow.png b/tests/manual/nodetypes/shadow.png
new file mode 100644
index 0000000000..8270565e87
--- /dev/null
+++ b/tests/manual/nodetypes/shadow.png