[Bf-blender-cvs] [680cb99] cycles_kernel_split: Use macros to set args for datainit kernel
varunsundar08
noreply at git.blender.org
Wed May 6 13:07:04 CEST 2015
Commit: 680cb995040ed80fdc728195d16ed4842264882c
Author: varunsundar08
Date: Wed May 6 12:48:25 2015 +0530
Branches: cycles_kernel_split
https://developer.blender.org/rB680cb995040ed80fdc728195d16ed4842264882c
Use macros to set args for datainit kernel
===================================================================
M intern/cycles/device/device_opencl.cpp
===================================================================
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index 933b86b..9c35f33 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -2535,128 +2535,108 @@ public:
/* Set arguments for ckPathTraceKernel_DataInit_SPLIT_KERNEL kernel */
cl_uint narg = 0;
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(kgbuffer), (void*)&kgbuffer));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(sd), (void*)&sd));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(sd_DL_shadow), (void*)&sd_DL_shadow));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(P_sd), (void*)&P_sd));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(P_sd_DL_shadow), (void*)&P_sd_DL_shadow));
-
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(N_sd), (void*)&N_sd));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(N_sd_DL_shadow), (void*)&N_sd_DL_shadow));
-
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(Ng_sd), (void*)&Ng_sd));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(Ng_sd_DL_shadow), (void*)&Ng_sd_DL_shadow));
-
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(I_sd), (void*)&I_sd));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(I_sd_DL_shadow), (void*)&I_sd_DL_shadow));
-
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(shader_sd), (void*)&shader_sd));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(shader_sd_DL_shadow), (void*)&shader_sd_DL_shadow));
-
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(flag_sd), (void*)&flag_sd));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(flag_sd_DL_shadow), (void*)&flag_sd_DL_shadow));
-
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(prim_sd), (void*)&prim_sd));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(prim_sd_DL_shadow), (void*)&prim_sd_DL_shadow));
-
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(type_sd), (void*)&type_sd));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(type_sd_DL_shadow), (void*)&type_sd_DL_shadow));
-
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(u_sd), (void*)&u_sd));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(u_sd_DL_shadow), (void*)&u_sd_DL_shadow));
-
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(v_sd), (void*)&v_sd));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(v_sd_DL_shadow), (void*)&v_sd_DL_shadow));
-
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(object_sd), (void*)&object_sd));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(object_sd_DL_shadow), (void*)&object_sd_DL_shadow));
-
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(time_sd), (void*)&time_sd));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(time_sd_DL_shadow), (void*)&time_sd_DL_shadow));
-
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(ray_length_sd), (void*)&ray_length_sd));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(ray_length_sd_DL_shadow), (void*)&ray_length_sd_DL_shadow));
-
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(ray_depth_sd), (void*)&ray_depth_sd));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(ray_depth_sd_DL_shadow), (void*)&ray_depth_sd_DL_shadow));
-
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(transparent_depth_sd), (void*)&transparent_depth_sd));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(transparent_depth_sd_DL_shadow), (void*)&transparent_depth_sd_DL_shadow));
+#define KERNEL_APPEND_ARG(kernel_name, arg) \
+ opencl_assert(clSetKernelArg(kernel_name, narg++, sizeof(arg), (void*)&arg))
+
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, kgbuffer);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, sd);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, sd_DL_shadow);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, P_sd);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, P_sd_DL_shadow);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, N_sd);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, N_sd_DL_shadow);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, Ng_sd);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, Ng_sd_DL_shadow);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, I_sd);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, I_sd_DL_shadow);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, shader_sd);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, shader_sd_DL_shadow);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, flag_sd);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, flag_sd_DL_shadow);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, prim_sd);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, prim_sd_DL_shadow);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, type_sd);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, type_sd_DL_shadow);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, u_sd);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, u_sd_DL_shadow);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, v_sd);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, v_sd_DL_shadow);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, object_sd);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, object_sd_DL_shadow);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, time_sd);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, time_sd_DL_shadow);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, ray_length_sd);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, ray_length_sd_DL_shadow);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, ray_depth_sd);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, ray_depth_sd_DL_shadow);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, transparent_depth_sd);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, transparent_depth_sd_DL_shadow);
#ifdef __RAY_DIFFERENTIALS__
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(dP_sd), (void*)&dP_sd));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(dP_sd_DL_shadow), (void*)&dP_sd_DL_shadow));
-
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(dI_sd), (void*)&dI_sd));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(dI_sd_DL_shadow), (void*)&dI_sd_DL_shadow));
-
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(du_sd), (void*)&du_sd));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(du_sd_DL_shadow), (void*)&du_sd_DL_shadow));
-
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(dv_sd), (void*)&dv_sd));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(dv_sd_DL_shadow), (void*)&dv_sd_DL_shadow));
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, dP_sd);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, dP_sd_DL_shadow);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, dI_sd);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, dI_sd_DL_shadow);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, du_sd);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, du_sd_DL_shadow);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, dv_sd);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, dv_sd_DL_shadow);
#endif
#ifdef __DPDU__
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(dPdu_sd), (void*)&dPdu_sd));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(dPdu_sd_DL_shadow), (void*)&dPdu_sd_DL_shadow));
-
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(dPdv_sd), (void*)&dPdv_sd));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(dPdv_sd_DL_shadow), (void*)&dPdv_sd_DL_shadow));
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, dPdu_sd);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, dPdu_sd_DL_shadow);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, dPdv_sd);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_DataInit_SPLIT_KERNEL, dPdv_sd_DL_shadow);
#endif
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(closure_sd), (void*)&closure_sd));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(closure_sd_DL_shadow), (void*)&closure_sd_DL_shadow));
-
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(num_closure_sd), (void*)&num_closure_sd));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_DataInit_SPLIT_KERNEL, narg++, sizeof(num_closure_sd_DL_shado
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list