[Bf-blender-cvs] [07d911a] cycles_kernel_split: Cycles kernel split: De-dupicate definition of KERNEL_APPEND_ARG

[Sergey Sharybin]

Commit: 07d911ac56da539a72951e9487d0d77000837846
Author: Sergey Sharybin
Date:   Fri May 8 20:38:05 2015 +0500
Branches: cycles_kernel_split
https://developer.blender.org/rB07d911ac56da539a72951e9487d0d77000837846

Cycles kernel split: De-dupicate definition of KERNEL_APPEND_ARG

===================================================================

M	intern/cycles/device/device_opencl.cpp

===================================================================

diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index 2180c70..2aa271d 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -39,6 +39,8 @@
 CCL_NAMESPACE_BEGIN
 
 #define CL_MEM_PTR(p) ((cl_mem)(uintptr_t)(p))
+#define KERNEL_APPEND_ARG(kernel_name, arg) \
+               opencl_assert(clSetKernelArg(kernel_name, narg++, sizeof(arg), (void*)&arg))
 
 /* Macro declarations used with split kernel */
 
@@ -1013,8 +1015,6 @@ public:
 		cl_kernel ckFilmConvertKernel = (rgba_byte)? ckFilmConvertByteKernel: ckFilmConvertHalfFloatKernel;
 
 		/* TODO : Make the kernel launch similar to Cuda */
-#define KERNEL_APPEND_ARG(kernel_name, arg) \
-		opencl_assert(clSetKernelArg(kernel_name, narg++, sizeof(arg), (void*)&arg))
 		KERNEL_APPEND_ARG(ckFilmConvertKernel, d_data);
 		KERNEL_APPEND_ARG(ckFilmConvertKernel, d_rgba);
 		KERNEL_APPEND_ARG(ckFilmConvertKernel, d_buffer);
@@ -1031,7 +1031,6 @@ public:
 		KERNEL_APPEND_ARG(ckFilmConvertKernel, d_h);
 		KERNEL_APPEND_ARG(ckFilmConvertKernel, d_offset);
 		KERNEL_APPEND_ARG(ckFilmConvertKernel, d_stride);
-#undef KERNEL_APPEND_ARG
 
 		enqueue_kernel(ckFilmConvertKernel, d_w, d_h);
 	}
@@ -1065,8 +1064,6 @@ public:
 			cl_int d_sample = sample;
 
 			/* TODO : Make the kernel launch similar to Cuda */
-#define KERNEL_APPEND_ARG(kernel_name, arg) \
-			opencl_assert(clSetKernelArg(kernel_name, narg++, sizeof(arg), (void*)&arg))
 			KERNEL_APPEND_ARG(kernel, d_data);
 			KERNEL_APPEND_ARG(kernel, d_input);
 			KERNEL_APPEND_ARG(kernel, d_output);
@@ -1081,7 +1078,6 @@ public:
 			KERNEL_APPEND_ARG(kernel, d_shader_w);
 			KERNEL_APPEND_ARG(kernel, d_offset);
 			KERNEL_APPEND_ARG(kernel, d_sample);
-#undef KERNEL_APPEND_ARG
 
 			enqueue_kernel(kernel, task.shader_w, 1);
 
@@ -1204,8 +1200,6 @@ public:
 		cl_uint narg = 0;
 
 		/* TODO : Make the kernel launch similar to Cuda */
-#define KERNEL_APPEND_ARG(kernel_name, arg) \
-		opencl_assert(clSetKernelArg(kernel_name, narg++, sizeof(arg), (void*)&arg))
 		KERNEL_APPEND_ARG(ckPathTraceKernel, d_data);
 		KERNEL_APPEND_ARG(ckPathTraceKernel, d_buffer);
 		KERNEL_APPEND_ARG(ckPathTraceKernel, d_rng_state);
@@ -1222,7 +1216,6 @@ public:
 		KERNEL_APPEND_ARG(ckPathTraceKernel, d_h);
 		KERNEL_APPEND_ARG(ckPathTraceKernel, d_offset);
 		KERNEL_APPEND_ARG(ckPathTraceKernel, d_stride);
-#undef KERNEL_APPEND_ARG
 
 		enqueue_kernel(ckPathTraceKernel, d_w, d_h);
 	}
@@ -2447,9 +2440,6 @@ public:
 		/* Set arguments for ckPathTraceKernel_DataInit kernel */
 		cl_uint narg = 0;
 
-#define KERNEL_APPEND_ARG(kernel_name, arg) \
-		opencl_assert(clSetKernelArg(kernel_name, narg++, sizeof(arg), (void*)&arg))
-
 		KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit, kgbuffer);
 		KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit, sd);
 		KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit, sd_DL_shadow);
@@ -2744,8 +2734,6 @@ public:
 		KERNEL_APPEND_ARG(ckPathTraceKernel_SumAllRadiance, rtile.buffer_rng_state_stride);
 		KERNEL_APPEND_ARG(ckPathTraceKernel_SumAllRadiance, start_sample);
 
-#undef KERNEL_APPEND_ARG
-
 		/* Macro for Enqueuing split kernels */
 #define ENQUEUE_SPLIT_KERNEL(kernelName, globalSize, localSize) \
 		opencl_assert(clEnqueueNDRangeKernel(cqCommandQueue, kernelName, 2, NULL, globalSize, localSize, 0, NULL, NULL))