[Bf-blender-cvs] [d613566] cycles_kernel_split: Cycles kernel split : Use macros to set arg for QueueEnqueue kernel
varunsundar08
noreply at git.blender.org
Wed May 6 13:07:08 CEST 2015
Commit: d613566873eecb2ca5d93fd65584367515ce5ca6
Author: varunsundar08
Date: Wed May 6 14:28:41 2015 +0530
Branches: cycles_kernel_split
https://developer.blender.org/rBd613566873eecb2ca5d93fd65584367515ce5ca6
Cycles kernel split : Use macros to set arg for QueueEnqueue 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 b35598d..f807f91 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -2679,10 +2679,10 @@ public:
/* Set arguments for ckPathTraceKernel_QueueEnqueue_SPLIT_KERNEL kernel */
narg = 0;
- opencl_assert(clSetKernelArg(ckPathTraceKernel_QueueEnqueue_SPLIT_KERNEL, narg++, sizeof(Queue_data), (void*)&Queue_data));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_QueueEnqueue_SPLIT_KERNEL, narg++, sizeof(Queue_index), (void*)&Queue_index));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_QueueEnqueue_SPLIT_KERNEL, narg++, sizeof(ray_state), (void*)&ray_state));
- opencl_assert(clSetKernelArg(ckPathTraceKernel_QueueEnqueue_SPLIT_KERNEL, narg++, sizeof(dQueue_size), (void*)&dQueue_size));
+ KERNEL_APPEND_ARG(ckPathTraceKernel_QueueEnqueue_SPLIT_KERNEL, Queue_data);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_QueueEnqueue_SPLIT_KERNEL, Queue_index);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_QueueEnqueue_SPLIT_KERNEL, ray_state);
+ KERNEL_APPEND_ARG(ckPathTraceKernel_QueueEnqueue_SPLIT_KERNEL, dQueue_size);
/* Set arguments for ckPathTraceKernel_BG_BufferUpdate_SPLIT_KERNEL kernel */
narg = 0;
More information about the Bf-blender-cvs
mailing list