Refactoring of tiles opencl implementation:

- Moved methods from NodeOperation to OpenCLDevice
- Added check on Nvidia for local size

1 files changed, 21 insertions, 2 deletions

diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.h b/source/blender/compositor/intern/COM_OpenCLDevice.h
index 83ce8cec811..d132f330651 100644
--- a/source/blender/compositor/intern/COM_OpenCLDevice.h
+++ b/source/blender/compositor/intern/COM_OpenCLDevice.h
@@ -29,7 +29,6 @@ class OpenCLDevice;
 #include "OCL_opencl.h"
 #include "COM_WorkScheduler.h"
 
-
 /**
  * @brief device representing an GPU OpenCL device.
  * an instance of this class represents a single cl_device
@@ -55,13 +54,21 @@ private:
 	 * @brief opencl command queue
 	 */
 	cl_command_queue queue;
+
+	/**
+	 * @brief opencl vendor ID
+	 */
+	cl_int 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);
+	OpenCLDevice(cl_context context, cl_device_id device, cl_program program, cl_int vendorId);
 	
 	
 	/**
@@ -83,6 +90,18 @@ public:
 	 * @param work the WorkPackage to execute
 	 */
 	void execute(WorkPackage *work);
+
+	cl_context getContext(){return this->context;}
+
+	cl_command_queue getQueue(){return this->queue;}
+
+	cl_mem COM_clAttachMemoryBufferToKernelParameter(cl_kernel kernel, int parameterIndex, int offsetIndex, list<cl_mem> *cleanup, MemoryBuffer **inputMemoryBuffers, SocketReader *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