[Bf-blender-cvs] [b261b22] cycles_kernel_split: Cycles kernel split : Use macros to set args for Shader Lighting kernel

varunsundar08 noreply at git.blender.org
Wed May 6 13:07:10 CEST 2015


Commit: b261b228ef1fde1fe67ad651ec7b23b7f0aabb92
Author: varunsundar08
Date:   Wed May 6 14:48:33 2015 +0530
Branches: cycles_kernel_split
https://developer.blender.org/rBb261b228ef1fde1fe67ad651ec7b23b7f0aabb92

Cycles kernel split : Use macros to set args for Shader Lighting 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 34f5888..a915298 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -2723,18 +2723,17 @@ public:
 
 		/* Set arguments for ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL */
 		narg = 0;
-		opencl_assert(clSetKernelArg(ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL, narg++, sizeof(kgbuffer), (void*)&kgbuffer));
-		opencl_assert(clSetKernelArg(ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL, narg++, sizeof(d_data), (void*)&d_data));
-		opencl_assert(clSetKernelArg(ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL, narg++, sizeof(sd), (void*)&sd));
-		opencl_assert(clSetKernelArg(ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL, narg++, sizeof(rng_coop), (void*)&rng_coop));
-		opencl_assert(clSetKernelArg(ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL, narg++, sizeof(Ray_coop), (void*)&Ray_coop));
-		opencl_assert(clSetKernelArg(ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL, narg++, sizeof(PathState_coop), (void*)&PathState_coop));
-		opencl_assert(clSetKernelArg(ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL, narg++, sizeof(Intersection_coop), (void*)&Intersection_coop));
-
-		opencl_assert(clSetKernelArg(ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL, narg++, sizeof(ray_state), (void*)&ray_state));
-		opencl_assert(clSetKernelArg(ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL, narg++, sizeof(Queue_data), (void *)&Queue_data));
-		opencl_assert(clSetKernelArg(ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL, narg++, sizeof(Queue_index), (void *)&Queue_index));
-		opencl_assert(clSetKernelArg(ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL, narg++, sizeof(dQueue_size), (void *)&dQueue_size));
+		KERNEL_APPEND_ARG(ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL, kgbuffer);
+		KERNEL_APPEND_ARG(ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL, d_data);
+		KERNEL_APPEND_ARG(ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL, sd);
+		KERNEL_APPEND_ARG(ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL, rng_coop);
+		KERNEL_APPEND_ARG(ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL, Ray_coop);
+		KERNEL_APPEND_ARG(ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL, PathState_coop);
+		KERNEL_APPEND_ARG(ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL, Intersection_coop);
+		KERNEL_APPEND_ARG(ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL, ray_state);
+		KERNEL_APPEND_ARG(ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL, Queue_data);
+		KERNEL_APPEND_ARG(ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL, Queue_index);
+		KERNEL_APPEND_ARG(ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL, dQueue_size);
 
 		/* Set up arguments for ckPathTraceKernel_Holdout_Emission_Blurring_Pathtermination_AO_SPLIT_KERNEL kernel */
 		narg = 0;




More information about the Bf-blender-cvs mailing list