blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Cleanup: Make WorkPackage a struct

This commit is contained in:
Jeroen Bakker 2021-03-05 15:06:49 +01:00
parent ba5961b4cd
commit 6ebd34c802
4 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/compositor/intern/COM_CPUDevice.cpp
View File

@ -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);

4
source/blender/compositor/intern/COM_OpenCLDevice.cpp
View File

@ -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);

6
source/blender/compositor/intern/COM_WorkPackage.cpp
View File

@ -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;
}

28
source/blender/compositor/intern/COM_WorkPackage.h
View File

@ -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")