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/nodemanagers_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/nodemanagers_p.h')
| -rw-r--r-- | src/render/backend/nodemanagers_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
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; |