diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-02-29 14:43:46 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2016-03-05 12:00:39 +0000 |
| commit | afe56dcfcd4ee34c85260871d67e229d383c4186 (patch) | |
| tree | 3930e0e7066e3be1d6a11d32e59a3f8f7dde7145 /src/render/backend/managers_p.h | |
| parent | af20237e24ca355c9369eff116c4b16df62737cd (diff) | |
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>
Diffstat (limited to 'src/render/backend/managers_p.h')
| -rw-r--r-- | src/render/backend/managers_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
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 |