Merge remote-tracking branch 5.15 into dev

Change-Id: I731aa986e1cc45b3af920db1a23f256927beecf7

1 files changed, 143 insertions, 0 deletions

diff --git a/tests/auto/render/opengl/computecommand/tst_computecommand.cpp b/tests/auto/render/opengl/computecommand/tst_computecommand.cpp
new file mode 100644
index 000000000..3caf11c8f
--- /dev/null
+++ b/tests/auto/render/opengl/computecommand/tst_computecommand.cpp
@@ -0,0 +1,143 @@
+/****************************************************************************
+**
+** Copyright (C) 2016  Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QtTest/QTest>
+#include <Qt3DRender/qcomputecommand.h>
+#include <Qt3DRender/private/qcomputecommand_p.h>
+#include <Qt3DRender/private/computecommand_p.h>
+#include <Qt3DRender/private/nodemanagers_p.h>
+#include <Qt3DRender/private/managers_p.h>
+#include <Qt3DCore/private/qbackendnode_p.h>
+#include <Qt3DCore/private/qaspectmanager_p.h>
+#include <Qt3DCore/private/qscene_p.h>
+#include <Qt3DCore/qpropertyupdatedchange.h>
+#include <renderer_p.h>
+#include "qbackendnodetester.h"
+#include "testrenderer.h"
+#include "testpostmanarbiter.h"
+
+
+// tst_Renderer is a friend class of Renderer
+class tst_Renderer : public Qt3DRender::Render::OpenGL::Renderer
+{
+public:
+    tst_Renderer()
+        : Qt3DRender::Render::OpenGL::Renderer(Qt3DRender::QRenderAspect::Synchronous)
+    {}
+
+    ~tst_Renderer() {
+        shutdown();
+    }
+};
+
+
+class tst_ComputeCommand : public Qt3DCore::QBackendNodeTester
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+
+    void checkDisablesFrontend()
+    {
+        // GIVEN
+        Qt3DRender::Render::NodeManagers nodeManager;
+        tst_Renderer renderer;
+        TestArbiter arbiter;
+
+        Qt3DCore::QAspectManager manager;
+        Qt3DCore::QScene scene;
+
+        Qt3DCore::QEntity rootEntity;
+        Qt3DCore::QNodePrivate::get(&rootEntity)->setScene(&scene);
+
+        Qt3DRender::QComputeCommand computeCommand;
+        Qt3DRender::Render::ComputeCommand *backendComputeCommand = nullptr;
+
+        renderer.setNodeManagers(&nodeManager);
+
+        // WHEN
+        computeCommand.setParent(&rootEntity);
+        // RootEntity is the entry point to retrieve the scene instance for lookups
+        manager.setRootEntity(&rootEntity, {});
+
+        // THEN
+        QVERIFY(scene.lookupNode(computeCommand.id()) != nullptr);
+
+        // WHEN
+        auto handle = nodeManager.computeJobManager()->getOrAcquireHandle(computeCommand.id());
+        backendComputeCommand = nodeManager.computeJobManager()->data(handle);
+
+        // WHEN
+        computeCommand.setWorkGroupX(256);
+        computeCommand.setWorkGroupY(512);
+        computeCommand.setWorkGroupZ(128);
+        computeCommand.setRunType(Qt3DRender::QComputeCommand::Manual);
+        computeCommand.trigger(1);
+
+        Qt3DCore::QBackendNodePrivate::get(backendComputeCommand)->setArbiter(&arbiter);
+        backendComputeCommand->setRenderer(&renderer);
+        simulateInitializationSync(&computeCommand, backendComputeCommand);
+
+        // THEN
+        QCOMPARE(backendComputeCommand->frameCount(),1);
+        QCOMPARE(backendComputeCommand->isEnabled(), true);
+        QCOMPARE(computeCommand.isEnabled(), true);
+        QCOMPARE(backendComputeCommand->hasReachedFrameCount(), false);
+
+        // WHEN
+        backendComputeCommand->updateFrameCount();
+
+        // THEN
+        QCOMPARE(backendComputeCommand->frameCount(), 0);
+        QCOMPARE(backendComputeCommand->hasReachedFrameCount(), true);
+
+
+        // Still enabled as we have yet to notify the fronted
+        QCOMPARE(backendComputeCommand->isEnabled(), true);
+        QCOMPARE(computeCommand.isEnabled(), true);
+
+        // WHEN
+        renderer.jobsDone(&manager);    // so Renderer::sendDisablesToFrontend gets called
+
+        // THEN
+        QCOMPARE(computeCommand.isEnabled(), false);
+        QCOMPARE(backendComputeCommand->hasReachedFrameCount(), false);
+
+        // WHEN
+        backendComputeCommand->syncFromFrontEnd(&computeCommand, false);
+
+        // THEN
+        QCOMPARE(backendComputeCommand->frameCount(), 0);
+        QCOMPARE(backendComputeCommand->isEnabled(), false);
+    }
+};
+
+QTEST_MAIN(tst_ComputeCommand)
+
+#include "tst_computecommand.moc"