Lukas Tönne
09874df135
Many parts of the compositor are unnecessarily complicated. This patch aims at reducing the complexity of writing nodes and making the code more transparent. == Separating Nodes and Operations == Currently these are both mixed in the same graph, even though they have very different purposes and are used at distinct stages in the compositing process. The patch introduces dedicated graph classes for nodes and for operations. This removes the need for a lot of special case checks (isOperation etc.) and explicit type casts. It simplifies the code since it becomes clear at every stage what type of node we are dealing with. The compiler can use static typing to avoid common bugs from mixing up these types and fewer runtime sanity checks are needed. == Simplified Node Conversion == Converting nodes to operations was previously based on "relinking", i.e. nodes would start with by mirroring links in the Blender DNA node trees, then add operations and redirect these links to them. This was very hard to follow in many cases and required a lot of attention to avoid invalid states. Now there is a helper class called the NodeConverter, which is passed to nodes and implements a much simpler API for this process. Nodes can add operations and explicit connections as before, but defining "external" links to the inputs/outputs of the original node now uses mapping instead of directly modifying link data. Input data (node graph) and result (operations graph) are cleanly separated. == Removed Redundant Data Structures == A few redundant data structures have been removed, notably the SocketConnection. These are only needed temporarily during graph construction. For executing the compositor operations it is perfectly sufficient to store only the direct input link pointers. A common pointer indirection is avoided this way (which might also give a little performance improvement). == Avoid virtual recursive functions == Recursive virtual functions are evil. They are very hard to follow during debugging. At least in the parts this patch is concerned with these functions have been replaced by a non-virtual recursive core function (which might then call virtual non-recursive functions if needed). See for example NodeOperationBuilder::group_operations.
112 lines
3.3 KiB
C++
112 lines
3.3 KiB
C++
/*
|
|
* Copyright 2011, Blender Foundation.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* Contributor:
|
|
* Jeroen Bakker
|
|
* Monique Dewanchand
|
|
*/
|
|
|
|
class OpenCLDevice;
|
|
|
|
#ifndef _COM_OpenCLDevice_h
|
|
#define _COM_OpenCLDevice_h
|
|
|
|
#include "COM_Device.h"
|
|
#include "OCL_opencl.h"
|
|
#include "COM_WorkScheduler.h"
|
|
#include "COM_ReadBufferOperation.h"
|
|
|
|
using std::list;
|
|
|
|
/**
|
|
* @brief device representing an GPU OpenCL device.
|
|
* an instance of this class represents a single cl_device
|
|
*/
|
|
class OpenCLDevice : public Device {
|
|
private:
|
|
/**
|
|
* @brief opencl context
|
|
*/
|
|
cl_context m_context;
|
|
|
|
/**
|
|
* @brief opencl device
|
|
*/
|
|
cl_device_id m_device;
|
|
|
|
/**
|
|
* @brief opencl program
|
|
*/
|
|
cl_program m_program;
|
|
|
|
/**
|
|
* @brief opencl command queue
|
|
*/
|
|
cl_command_queue m_queue;
|
|
|
|
/**
|
|
* @brief opencl vendor ID
|
|
*/
|
|
cl_int m_vendorID;
|
|
|
|
public:
|
|
/**
|
|
* @brief constructor with opencl device
|
|
* @param context
|
|
* @param device
|
|
* @param program
|
|
* @param vendorID
|
|
*/
|
|
OpenCLDevice(cl_context context, cl_device_id device, cl_program program, cl_int vendorId);
|
|
|
|
|
|
/**
|
|
* @brief initialize the device
|
|
* During initialization the OpenCL cl_command_queue is created
|
|
* the command queue is stored in the field queue.
|
|
* @see queue
|
|
*/
|
|
bool initialize();
|
|
|
|
/**
|
|
* @brief deinitialize the device
|
|
* During deintiialization the command queue is cleared
|
|
*/
|
|
void deinitialize();
|
|
|
|
/**
|
|
* @brief execute a WorkPackage
|
|
* @param work the WorkPackage to execute
|
|
*/
|
|
void execute(WorkPackage *work);
|
|
|
|
cl_context getContext() { return this->m_context; }
|
|
|
|
cl_command_queue getQueue() { return this->m_queue; }
|
|
|
|
cl_mem COM_clAttachMemoryBufferToKernelParameter(cl_kernel kernel, int parameterIndex, int offsetIndex, list<cl_mem> *cleanup, MemoryBuffer **inputMemoryBuffers, SocketReader *reader);
|
|
cl_mem COM_clAttachMemoryBufferToKernelParameter(cl_kernel kernel, int parameterIndex, int offsetIndex, list<cl_mem> *cleanup, MemoryBuffer **inputMemoryBuffers, ReadBufferOperation *reader);
|
|
void COM_clAttachMemoryBufferOffsetToKernelParameter(cl_kernel kernel, int offsetIndex, MemoryBuffer *memoryBuffers);
|
|
void COM_clAttachOutputMemoryBufferToKernelParameter(cl_kernel kernel, int parameterIndex, cl_mem clOutputMemoryBuffer);
|
|
void COM_clAttachSizeToKernelParameter(cl_kernel kernel, int offsetIndex, NodeOperation *operation);
|
|
void COM_clEnqueueRange(cl_kernel kernel, MemoryBuffer *outputMemoryBuffer);
|
|
void COM_clEnqueueRange(cl_kernel kernel, MemoryBuffer *outputMemoryBuffer, int offsetIndex, NodeOperation *operation);
|
|
cl_kernel COM_clCreateKernel(const char *kernelname, list<cl_kernel> *clKernelsToCleanUp);
|
|
};
|
|
|
|
#endif
|