[Bf-blender-cvs] [3a3dafb] cycles_kernel_split: Cycles kernel split : Use macros to set args for shadow_blocked kernel
varunsundar08
noreply at git.blender.org
Wed May 6 13:07:14 CEST 2015
Commit: 3a3dafbc6c32f2c81b331644fc7f20f2deb7ed62
Author: varunsundar08
Date: Wed May 6 15:03:10 2015 +0530
Branches: cycles_kernel_split
https://developer.blender.org/rB3a3dafbc6c32f2c81b331644fc7f20f2deb7ed62
Cycles kernel split : Use macros to set args for shadow_blocked 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 fa3299e..589362c 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -2783,20 +2783,19 @@ public:
/* Set up arguments for ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL kernel */
narg = 0;
- opencl_assert(clSetKernelArg(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, narg++, sizeof(kgbuffer), (void*)&kgbuffer));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, narg++, sizeof(d_data), (void*)&d_data));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, narg++, sizeof(sd_DL_shadow), (void*)&sd_DL_shadow));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, narg++, sizeof(PathState_coop), (void*)&PathState_coop));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, narg++, sizeof(LightRay_coop), (void*)&LightRay_coop));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, narg++, sizeof(AOLightRay_coop), (void*)&AOLightRay_coop));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, narg++, sizeof(Intersection_coop_AO), (void*)&Intersection_coop_AO));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, narg++, sizeof(Intersection_coop_DL), (void*)&Intersection_coop_DL));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, narg++, sizeof(ray_state), (void*)&ray_state));
-
- opencl_assert(clSetKernelArg(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, narg++, sizeof(Queue_data), (void*)&Queue_data));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, narg++, sizeof(Queue_index), (void*)&Queue_index));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, narg++, sizeof(dQueue_size), (void*)&dQueue_size));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, narg++, sizeof(total_num_rays), (void*)&total_num_rays));
+ KERNEL_APPEND_ARG(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, kgbuffer);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, d_data);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, sd_DL_shadow);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, PathState_coop);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, LightRay_coop);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, AOLightRay_coop);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, Intersection_coop_AO);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, Intersection_coop_DL);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, ray_state);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, Queue_data);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, Queue_index);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, dQueue_size);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL, total_num_rays);
/* Set up arguments for ckPathTraceKernel_SetUpNextIteration_SPLIT_KERNEL kernel */
narg = 0;
More information about the Bf-blender-cvs
mailing list