QComputeJob cleanup

* Renamed to QComputeCommand
* Removed protected ctor
* Added x,y,z workgroup properties
* Renamed backend elements to match frontend

Change-Id: I3959ec671a7d6e86239f72336f02452ea58919ee
Task-number: QTBUG-51514
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

10 files changed, 40 insertions, 39 deletions

diff --git a/src/render/backend/computejob.cpp b/src/render/backend/computecommand.cpp
index 983954221..4ec5d931d 100644
--- a/src/render/backend/computejob.cpp
+++ b/src/render/backend/computecommand.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "computejob_p.h"
+#include "computecommand_p.h"
 #include <Qt3DCore/qnode.h>
 #include <Qt3DCore/qscenepropertychange.h>
 #include <Qt3DRender/private/abstractrenderer_p.h>
@@ -48,29 +48,29 @@ namespace Qt3DRender {
 
 namespace Render {
 
-ComputeJob::ComputeJob()
+ComputeCommand::ComputeCommand()
     : BackendNode(ReadOnly)
     , m_enabled(false)
 {
 }
 
-ComputeJob::~ComputeJob()
+ComputeCommand::~ComputeCommand()
 {
 }
 
-void ComputeJob::cleanup()
+void ComputeCommand::cleanup()
 {
     m_enabled = false;
 }
 
-void ComputeJob::updateFromPeer(Qt3DCore::QNode *peer)
+void ComputeCommand::updateFromPeer(Qt3DCore::QNode *peer)
 {
     m_enabled = peer->isEnabled();
     if (m_renderer != Q_NULLPTR)
         BackendNode::markDirty(AbstractRenderer::ComputeDirty);
 }
 
-void ComputeJob::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
+void ComputeCommand::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     Qt3DCore::QScenePropertyChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QScenePropertyChange>(e);
     if (e->type() == Qt3DCore::NodeUpdated) {
diff --git a/src/render/backend/computejob_p.h b/src/render/backend/computecommand_p.h
index e7e856a50..403845be1 100644
--- a/src/render/backend/computejob_p.h
+++ b/src/render/backend/computecommand_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_COMPUTEJOB_P_H
-#define QT3DRENDER_RENDER_COMPUTEJOB_P_H
+#ifndef QT3DRENDER_RENDER_COMPUTECOMMAND_P_H
+#define QT3DRENDER_RENDER_COMPUTECOMMAND_P_H
 
 //
 //  W A R N I N G
@@ -61,11 +61,11 @@ namespace Render {
 
 class ComputeJobPrivate;
 
-class Q_AUTOTEST_EXPORT ComputeJob : public BackendNode
+class Q_AUTOTEST_EXPORT ComputeCommand : public BackendNode
 {
 public:
-    ComputeJob();
-    ~ComputeJob();
+    ComputeCommand();
+    ~ComputeCommand();
 
     void cleanup();
 
@@ -84,4 +84,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_COMPUTEJOB_P_H
+#endif // QT3DRENDER_RENDER_COMPUTECOMMAND_P_H
diff --git a/src/render/backend/entity.cpp b/src/render/backend/entity.cpp
index 4c2650195..49d60af3e 100644
--- a/src/render/backend/entity.cpp
+++ b/src/render/backend/entity.cpp
@@ -50,7 +50,7 @@
 #include <Qt3DRender/qgeometryrenderer.h>
 #include <Qt3DRender/qobjectpicker.h>
 #include <Qt3DRender/qboundingvolumedebug.h>
-#include <Qt3DRender/qcomputejob.h>
+#include <Qt3DRender/qcomputecommand.h>
 #include <Qt3DRender/private/geometryrenderermanager_p.h>
 
 #include <Qt3DRender/qcameralens.h>
@@ -287,7 +287,7 @@ void Entity::addComponent(Qt3DCore::QComponent *component)
         m_objectPickerComponent = component->id();
     } else if (qobject_cast<QBoundingVolumeDebug *>(component) != Q_NULLPTR) {
         m_boundingVolumeDebugComponent = component->id();
-    } else if (qobject_cast<QComputeJob *>(component) != Q_NULLPTR) {
+    } else if (qobject_cast<QComputeCommand *>(component) != Q_NULLPTR) {
         m_computeComponent = component->id();
     }
 }
@@ -407,7 +407,7 @@ QList<HLight> Entity::componentsHandle<Light>() const
 }
 
 template<>
-HComputeJob Entity::componentHandle<ComputeJob>() const
+HComputeCommand Entity::componentHandle<ComputeCommand>() const
 {
     return m_nodeManagers->computeJobManager()->lookupHandle(m_computeComponent);
 }
@@ -481,7 +481,7 @@ BoundingVolumeDebug *Entity::renderComponent<BoundingVolumeDebug>() const
 }
 
 template<>
-ComputeJob *Entity::renderComponent<ComputeJob>() const
+ComputeCommand *Entity::renderComponent<ComputeCommand>() const
 {
     return m_nodeManagers->computeJobManager()->lookupResource(m_computeComponent);
 }
@@ -513,7 +513,7 @@ template<>
 QNodeId Entity::componentUuid<BoundingVolumeDebug>() const { return m_boundingVolumeDebugComponent; }
 
 template<>
-QNodeId Entity::componentUuid<ComputeJob>() const { return m_computeComponent; }
+QNodeId Entity::componentUuid<ComputeCommand>() const { return m_computeComponent; }
 
 template<>
 QVector<Qt3DCore::QNodeId> Entity::componentsUuid<Light>() const { return m_lightComponents; }
diff --git a/src/render/backend/entity_p.h b/src/render/backend/entity_p.h
index c31096f26..2bc80db20 100644
--- a/src/render/backend/entity_p.h
+++ b/src/render/backend/entity_p.h
@@ -211,7 +211,7 @@ template<>
 QList<HLight> Entity::componentsHandle<Light>() const;
 
 template<>
-Q_AUTOTEST_EXPORT HComputeJob Entity::componentHandle<ComputeJob>() const;
+Q_AUTOTEST_EXPORT HComputeCommand Entity::componentHandle<ComputeCommand>() const;
 
 // Render components
 template<>
@@ -242,7 +242,7 @@ template<>
 QList<Light *> Entity::renderComponents<Light>() const;
 
 template<>
-Q_AUTOTEST_EXPORT ComputeJob *Entity::renderComponent<ComputeJob>() const;
+Q_AUTOTEST_EXPORT ComputeCommand *Entity::renderComponent<ComputeCommand>() const;
 
 // UUid
 template<>
@@ -270,7 +270,7 @@ template<>
 Q_AUTOTEST_EXPORT Qt3DCore::QNodeId Entity::componentUuid<BoundingVolumeDebug>() const;
 
 template<>
-Q_AUTOTEST_EXPORT Qt3DCore::QNodeId Entity::componentUuid<ComputeJob>() const;
+Q_AUTOTEST_EXPORT Qt3DCore::QNodeId Entity::componentUuid<ComputeCommand>() const;
 
 template<>
 Q_AUTOTEST_EXPORT QVector<Qt3DCore::QNodeId> Entity::componentsUuid<Light>() const;
diff --git a/src/render/backend/handle_types_p.h b/src/render/backend/handle_types_p.h
index 5815f19dc..d3600e12b 100644
--- a/src/render/backend/handle_types_p.h
+++ b/src/render/backend/handle_types_p.h
@@ -90,7 +90,7 @@ class ObjectPicker;
 class BoundingVolumeDebug;
 class OpenGLVertexArrayObject;
 class Light;
-class ComputeJob;
+class ComputeCommand;
 class GLBuffer;
 class RenderStateNode;
 
@@ -122,7 +122,7 @@ typedef Qt3DCore::QHandle<GeometryRenderer, 16> HGeometryRenderer;
 typedef Qt3DCore::QHandle<ObjectPicker, 16> HObjectPicker;
 typedef Qt3DCore::QHandle<BoundingVolumeDebug, 16> HBoundingVolumeDebug;
 typedef Qt3DCore::QHandle<Light, 16> HLight;
-typedef Qt3DCore::QHandle<ComputeJob, 16> HComputeJob;
+typedef Qt3DCore::QHandle<ComputeCommand, 16> HComputeCommand;
 typedef Qt3DCore::QHandle<GLBuffer, 16> HGLBuffer;
 typedef Qt3DCore::QHandle<RenderStateNode, 16> HRenderState;
 
diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h
index 0c78c2c8d..83a1d4013 100644
--- a/src/render/backend/managers_p.h
+++ b/src/render/backend/managers_p.h
@@ -78,7 +78,7 @@
 #include <Qt3DRender/private/boundingvolumedebug_p.h>
 #include <Qt3DRender/private/openglvertexarrayobject_p.h>
 #include <Qt3DRender/private/light_p.h>
-#include <Qt3DRender/private/computejob_p.h>
+#include <Qt3DRender/private/computecommand_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -357,15 +357,15 @@ public:
     LightManager() {}
 };
 
-class ComputeJobManager : public Qt3DCore::QResourceManager<
-        ComputeJob,
+class ComputeCommandManager : public Qt3DCore::QResourceManager<
+        ComputeCommand,
         Qt3DCore::QNodeId,
         16,
         Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::ObjectLevelLockingPolicy>
 {
 public:
-    ComputeJobManager() {}
+    ComputeCommandManager() {}
 };
 
 class RenderStateManager : public Qt3DCore::QResourceManager<
@@ -397,7 +397,7 @@ Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Attribute, Q_REQUIRES_CLEANUP)
 Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Geometry, Q_REQUIRES_CLEANUP)
 Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::ObjectPicker, Q_REQUIRES_CLEANUP)
 Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::BoundingVolumeDebug, Q_REQUIRES_CLEANUP)
-Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::ComputeJob, Q_REQUIRES_CLEANUP)
+Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::ComputeCommand, Q_REQUIRES_CLEANUP)
 
 QT_END_NAMESPACE
 
diff --git a/src/render/backend/nodemanagers.cpp b/src/render/backend/nodemanagers.cpp
index 890309d31..5f3e943ae 100644
--- a/src/render/backend/nodemanagers.cpp
+++ b/src/render/backend/nodemanagers.cpp
@@ -84,7 +84,7 @@ NodeManagers::NodeManagers()
     , m_objectPickerManager(new ObjectPickerManager())
     , m_boundingVolumeDebugManager(new BoundingVolumeDebugManager())
     , m_lightManager(new LightManager())
-    , m_computeJobManager(new ComputeJobManager())
+    , m_computeJobManager(new ComputeCommandManager())
     , m_renderStateManager(new RenderStateManager())
 {
 }
@@ -270,7 +270,7 @@ LightManager *NodeManagers::manager<Light>() const Q_DECL_NOEXCEPT
 }
 
 template<>
-ComputeJobManager *NodeManagers::manager<ComputeJob>() const Q_DECL_NOEXCEPT
+ComputeCommandManager *NodeManagers::manager<ComputeCommand>() const Q_DECL_NOEXCEPT
 {
     return m_computeJobManager;
 }
diff --git a/src/render/backend/nodemanagers_p.h b/src/render/backend/nodemanagers_p.h
index 1edbc8c24..8b9537119 100644
--- a/src/render/backend/nodemanagers_p.h
+++ b/src/render/backend/nodemanagers_p.h
@@ -95,7 +95,7 @@ class TextureManager;
 class TextureDataManager;
 class LayerManager;
 class LightManager;
-class ComputeJobManager;
+class ComputeCommandManager;
 class RenderStateManager;
 
 class FrameGraphNode;
@@ -127,7 +127,7 @@ class GeometryRenderer;
 class ObjectPicker;
 class BoundingVolumeDebug;
 class Light;
-class ComputeJob;
+class ComputeCommand;
 class RenderStateNode;
 
 class QT3DRENDERSHARED_PRIVATE_EXPORT NodeManagers
@@ -199,7 +199,7 @@ public:
     inline ObjectPickerManager *objectPickerManager() const Q_DECL_NOEXCEPT { return m_objectPickerManager; }
     inline BoundingVolumeDebugManager *boundingVolumeDebugManager() const Q_DECL_NOEXCEPT { return m_boundingVolumeDebugManager; }
     inline LightManager *lightManager() const Q_DECL_NOEXCEPT { return m_lightManager; }
-    inline ComputeJobManager *computeJobManager() const Q_DECL_NOEXCEPT { return m_computeJobManager; }
+    inline ComputeCommandManager *computeJobManager() const Q_DECL_NOEXCEPT { return m_computeJobManager; }
     inline RenderStateManager *renderStateManager() const Q_DECL_NOEXCEPT { return m_renderStateManager; }
 
 private:
@@ -233,7 +233,7 @@ private:
     ObjectPickerManager *m_objectPickerManager;
     BoundingVolumeDebugManager *m_boundingVolumeDebugManager;
     LightManager *m_lightManager;
-    ComputeJobManager *m_computeJobManager;
+    ComputeCommandManager *m_computeJobManager;
     RenderStateManager *m_renderStateManager;
 };
 
@@ -330,7 +330,7 @@ template<>
 LightManager *NodeManagers::manager<Light>() const Q_DECL_NOEXCEPT;
 
 template<>
-QT3DRENDERSHARED_PRIVATE_EXPORT ComputeJobManager *NodeManagers::manager<ComputeJob>() const Q_DECL_NOEXCEPT;
+QT3DRENDERSHARED_PRIVATE_EXPORT ComputeCommandManager *NodeManagers::manager<ComputeCommand>() const Q_DECL_NOEXCEPT;
 
 template<>
 QT3DRENDERSHARED_PRIVATE_EXPORT RenderStateManager *NodeManagers::manager<RenderStateNode>() const Q_DECL_NOEXCEPT;
diff --git a/src/render/backend/render-backend.pri b/src/render/backend/render-backend.pri
index 1ec388bab..a874a5a4d 100644
--- a/src/render/backend/render-backend.pri
+++ b/src/render/backend/render-backend.pri
@@ -30,7 +30,7 @@ HEADERS += \
     $$PWD/trianglesextractor_p.h \
     $$PWD/trianglesvisitor_p.h \
     $$PWD/abstractrenderer_p.h \
-    $$PWD/computejob_p.h \
+    $$PWD/computecommand_p.h \
     $$PWD/rendersettings_p.h \
     $$PWD/stringtoint_p.h \
     $$PWD/backendnode_p.h \
@@ -58,8 +58,9 @@ SOURCES += \
     $$PWD/triangleboundingvolume.cpp \
     $$PWD/trianglesextractor.cpp \
     $$PWD/trianglesvisitor.cpp \
-    $$PWD/computejob.cpp \
+    $$PWD/computecommand.cpp \
     $$PWD/rendersettings.cpp \
     $$PWD/stringtoint.cpp \
     $$PWD/backendnode.cpp \
     $$PWD/rendertargetoutput.cpp
+
diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp
index f12d89429..5ef0b98c0 100644
--- a/src/render/backend/renderview.cpp
+++ b/src/render/backend/renderview.cpp
@@ -594,9 +594,9 @@ void RenderView::buildComputeRenderCommands(Entity *node)
     // enabled flag
     // layer component
     // material/effect/technique/parameters/filters/
-    ComputeJob *computeJob = Q_NULLPTR;
-    if (node->componentHandle<ComputeJob, 16>() != HComputeJob()
-            && (computeJob = node->renderComponent<ComputeJob>()) != Q_NULLPTR
+    ComputeCommand *computeJob = Q_NULLPTR;
+    if (node->componentHandle<ComputeCommand, 16>() != HComputeCommand()
+            && (computeJob = node->renderComponent<ComputeCommand>()) != Q_NULLPTR
             && computeJob->isEnabled()) {
 
         ParameterInfoList parameters;