diff options
Diffstat (limited to 'source')
4 files changed, 12 insertions, 30 deletions
diff --git a/source/blender/compositor/intern/COM_CPUDevice.cpp b/source/blender/compositor/intern/COM_CPUDevice.cpp index 7ea12866148..b520a437008 100644 --- a/source/blender/compositor/intern/COM_CPUDevice.cpp +++ b/source/blender/compositor/intern/COM_CPUDevice.cpp @@ -24,8 +24,8 @@ CPUDevice::CPUDevice(int thread_id) : m_thread_id(thread_id) void CPUDevice::execute(WorkPackage *work) { - const unsigned int chunkNumber = work->getChunkNumber(); - ExecutionGroup *executionGroup = work->getExecutionGroup(); + const unsigned int chunkNumber = work->chunk_number; + ExecutionGroup *executionGroup = work->execution_group; rcti rect; executionGroup->determineChunkRect(&rect, chunkNumber); diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.cpp b/source/blender/compositor/intern/COM_OpenCLDevice.cpp index 2082c87da8c..34450366aec 100644 --- a/source/blender/compositor/intern/COM_OpenCLDevice.cpp +++ b/source/blender/compositor/intern/COM_OpenCLDevice.cpp @@ -61,8 +61,8 @@ void OpenCLDevice::deinitialize() void OpenCLDevice::execute(WorkPackage *work) { - const unsigned int chunkNumber = work->getChunkNumber(); - ExecutionGroup *executionGroup = work->getExecutionGroup(); + const unsigned int chunkNumber = work->chunk_number; + ExecutionGroup *executionGroup = work->execution_group; rcti rect; executionGroup->determineChunkRect(&rect, chunkNumber); diff --git a/source/blender/compositor/intern/COM_WorkPackage.cpp b/source/blender/compositor/intern/COM_WorkPackage.cpp index 795f8d88d50..60684f2c45c 100644 --- a/source/blender/compositor/intern/COM_WorkPackage.cpp +++ b/source/blender/compositor/intern/COM_WorkPackage.cpp @@ -18,8 +18,8 @@ #include "COM_WorkPackage.h" -WorkPackage::WorkPackage(ExecutionGroup *group, unsigned int chunkNumber) +WorkPackage::WorkPackage(ExecutionGroup *execution_group, unsigned int chunk_number) { - this->m_executionGroup = group; - this->m_chunkNumber = chunkNumber; + this->execution_group = execution_group; + this->chunk_number = chunk_number; } diff --git a/source/blender/compositor/intern/COM_WorkPackage.h b/source/blender/compositor/intern/COM_WorkPackage.h index f4370aa41be..81616e123b2 100644 --- a/source/blender/compositor/intern/COM_WorkPackage.h +++ b/source/blender/compositor/intern/COM_WorkPackage.h @@ -27,41 +27,23 @@ class ExecutionGroup; * \brief contains data about work that can be scheduled * \see WorkScheduler */ -class WorkPackage { - private: +struct WorkPackage { /** * \brief executionGroup with the operations-setup to be evaluated */ - ExecutionGroup *m_executionGroup; + ExecutionGroup *execution_group; /** * \brief number of the chunk to be executed */ - unsigned int m_chunkNumber; + unsigned int chunk_number; - public: /** * constructor * \param group: the ExecutionGroup - * \param chunkNumber: the number of the chunk + * \param chunk_number: the number of the chunk */ - WorkPackage(ExecutionGroup *group, unsigned int chunkNumber); - - /** - * \brief get the ExecutionGroup - */ - ExecutionGroup *getExecutionGroup() const - { - return this->m_executionGroup; - } - - /** - * \brief get the number of the chunk - */ - unsigned int getChunkNumber() const - { - return this->m_chunkNumber; - } + WorkPackage(ExecutionGroup *group, unsigned int chunk_number); #ifdef WITH_CXX_GUARDEDALLOC MEM_CXX_CLASS_ALLOC_FUNCS("COM:WorkPackage") |