[Bf-blender-cvs] [0c0b803] cycles_kernel_split: Cycles kernel split : Remove SPLIT_KERNEL suffix in device_opencl.cpp
Jothi_PM
noreply at git.blender.org
Wed May 6 19:57:40 CEST 2015
Commit: 0c0b80395f3c1d9b4edb9530c794e7d5c8621b6c
Author: Jothi_PM
Date: Wed May 6 19:58:03 2015 +0530
Branches: cycles_kernel_split
https://developer.blender.org/rB0c0b80395f3c1d9b4edb9530c794e7d5c8621b6c
Cycles kernel split : Remove SPLIT_KERNEL suffix in device_opencl.cpp
===================================================================
M intern/cycles/device/device_opencl.cpp
===================================================================
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index a4f231e..481adb0 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -1323,17 +1323,17 @@ public:
DedicatedTaskPool task_pool;
/* Kernel declaration */
- cl_kernel ckPathTraceKernel_DataInit_SPLIT_KERNEL;
- cl_kernel ckPathTraceKernel_SceneIntersect_SPLIT_KERNEL;
- cl_kernel ckPathTraceKernel_LampEmission_SPLIT_KERNEL;
- cl_kernel ckPathTraceKernel_QueueEnqueue_SPLIT_KERNEL;
- cl_kernel ckPathTraceKernel_BG_BufferUpdate_SPLIT_KERNEL;
- cl_kernel ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL;
- cl_kernel ckPathTraceKernel_Holdout_Emission_Blurring_Pathtermination_AO_SPLIT_KERNEL;
- cl_kernel ckPathTraceKernel_DirectLighting_SPLIT_KERNEL;
- cl_kernel ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL;
- cl_kernel ckPathTraceKernel_SetUpNextIteration_SPLIT_KERNEL;
- cl_kernel ckPathTraceKernel_SumAllRadiance_SPLIT_KERNEL;
+ cl_kernel ckPathTraceKernel_DataInit;
+ cl_kernel ckPathTraceKernel_SceneIntersect;
+ cl_kernel ckPathTraceKernel_LampEmission;
+ cl_kernel ckPathTraceKernel_QueueEnqueue;
+ cl_kernel ckPathTraceKernel_BG_BufferUpdate;
+ cl_kernel ckPathTraceKernel_Shader_Lighting;
+ cl_kernel ckPathTraceKernel_Holdout_Emission_Blurring_Pathtermination_AO;
+ cl_kernel ckPathTraceKernel_DirectLighting;
+ cl_kernel ckPathTraceKernel_ShadowBlocked_DirectLighting;
+ cl_kernel ckPathTraceKernel_SetUpNextIteration;
+ cl_kernel ckPathTraceKernel_SumAllRadiance;
/* cl_program declaration */
cl_program dataInit_program;
@@ -1514,17 +1514,17 @@ public:
background = background_;
/* Initialize kernels */
- ckPathTraceKernel_DataInit_SPLIT_KERNEL = NULL;
- ckPathTraceKernel_SceneIntersect_SPLIT_KERNEL = NULL;
- ckPathTraceKernel_LampEmission_SPLIT_KERNEL = NULL;
- ckPathTraceKernel_BG_BufferUpdate_SPLIT_KERNEL = NULL;
- ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL = NULL;
- ckPathTraceKernel_Holdout_Emission_Blurring_Pathtermination_AO_SPLIT_KERNEL = NULL;
- ckPathTraceKernel_DirectLighting_SPLIT_KERNEL = NULL;
- ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL = NULL;
- ckPathTraceKernel_SetUpNextIteration_SPLIT_KERNEL = NULL;
- ckPathTraceKernel_SumAllRadiance_SPLIT_KERNEL = NULL;
- ckPathTraceKernel_QueueEnqueue_SPLIT_KERNEL = NULL;
+ ckPathTraceKernel_DataInit = NULL;
+ ckPathTraceKernel_SceneIntersect = NULL;
+ ckPathTraceKernel_LampEmission = NULL;
+ ckPathTraceKernel_BG_BufferUpdate = NULL;
+ ckPathTraceKernel_Shader_Lighting = NULL;
+ ckPathTraceKernel_Holdout_Emission_Blurring_Pathtermination_AO = NULL;
+ ckPathTraceKernel_DirectLighting = NULL;
+ ckPathTraceKernel_ShadowBlocked_DirectLighting = NULL;
+ ckPathTraceKernel_SetUpNextIteration = NULL;
+ ckPathTraceKernel_SumAllRadiance = NULL;
+ ckPathTraceKernel_QueueEnqueue = NULL;
/* Initialize program */
dataInit_program = NULL;
@@ -2006,47 +2006,47 @@ public:
current_clos_max = clos_max;
/* find kernels */
- ckPathTraceKernel_DataInit_SPLIT_KERNEL = clCreateKernel(dataInit_program, "kernel_ocl_path_trace_data_initialization_SPLIT_KERNEL", &ciErr);
+ ckPathTraceKernel_DataInit = clCreateKernel(dataInit_program, "kernel_ocl_path_trace_data_initialization_SPLIT_KERNEL", &ciErr);
if(opencl_error(ciErr))
return false;
- ckPathTraceKernel_SceneIntersect_SPLIT_KERNEL = clCreateKernel(sceneIntersect_program, "kernel_ocl_path_trace_SceneIntersect_SPLIT_KERNEL", &ciErr);
+ ckPathTraceKernel_SceneIntersect = clCreateKernel(sceneIntersect_program, "kernel_ocl_path_trace_SceneIntersect_SPLIT_KERNEL", &ciErr);
if(opencl_error(ciErr))
return false;
- ckPathTraceKernel_LampEmission_SPLIT_KERNEL = clCreateKernel(lampEmission_program, "kernel_ocl_path_trace_LampEmission_SPLIT_KERNEL", &ciErr);
+ ckPathTraceKernel_LampEmission = clCreateKernel(lampEmission_program, "kernel_ocl_path_trace_LampEmission_SPLIT_KERNEL", &ciErr);
if(opencl_error(ciErr))
return false;
- ckPathTraceKernel_QueueEnqueue_SPLIT_KERNEL = clCreateKernel(QueueEnqueue_program, "kernel_ocl_path_trace_QueueEnqueue_SPLIT_KERNEL", &ciErr);
+ ckPathTraceKernel_QueueEnqueue = clCreateKernel(QueueEnqueue_program, "kernel_ocl_path_trace_QueueEnqueue_SPLIT_KERNEL", &ciErr);
if(opencl_error(ciErr))
return false;
- ckPathTraceKernel_BG_BufferUpdate_SPLIT_KERNEL = clCreateKernel(background_BufferUpdate_program, "kernel_ocl_path_trace_Background_BufferUpdate_SPLIT_KERNEL", &ciErr);
+ ckPathTraceKernel_BG_BufferUpdate = clCreateKernel(background_BufferUpdate_program, "kernel_ocl_path_trace_Background_BufferUpdate_SPLIT_KERNEL", &ciErr);
if(opencl_error(ciErr))
return false;
- ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL = clCreateKernel(shaderEval_program, "kernel_ocl_path_trace_ShaderEvaluation_SPLIT_KERNEL", &ciErr);
+ ckPathTraceKernel_Shader_Lighting = clCreateKernel(shaderEval_program, "kernel_ocl_path_trace_ShaderEvaluation_SPLIT_KERNEL", &ciErr);
if(opencl_error(ciErr))
return false;
- ckPathTraceKernel_Holdout_Emission_Blurring_Pathtermination_AO_SPLIT_KERNEL = clCreateKernel(holdout_emission_blurring_termination_ao_program, "kernel_ocl_path_trace_holdout_emission_blurring_pathtermination_AO_SPLIT_KERNEL", &ciErr);
+ ckPathTraceKernel_Holdout_Emission_Blurring_Pathtermination_AO = clCreateKernel(holdout_emission_blurring_termination_ao_program, "kernel_ocl_path_trace_holdout_emission_blurring_pathtermination_AO_SPLIT_KERNEL", &ciErr);
if(opencl_error(ciErr))
return false;
- ckPathTraceKernel_DirectLighting_SPLIT_KERNEL = clCreateKernel(directLighting_program, "kernel_ocl_path_trace_DirectLighting_SPLIT_KERNEL", &ciErr);
+ ckPathTraceKernel_DirectLighting = clCreateKernel(directLighting_program, "kernel_ocl_path_trace_DirectLighting_SPLIT_KERNEL", &ciErr);
if(opencl_error(ciErr))
return false;
- ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL = clCreateKernel(shadowBlocked_program, "kernel_ocl_path_trace_ShadowBlocked_DirectLighting_SPLIT_KERNEL", &ciErr);
+ ckPathTraceKernel_ShadowBlocked_DirectLighting = clCreateKernel(shadowBlocked_program, "kernel_ocl_path_trace_ShadowBlocked_DirectLighting_SPLIT_KERNEL", &ciErr);
if(opencl_error(ciErr))
return false;
- ckPathTraceKernel_SetUpNextIteration_SPLIT_KERNEL = clCreateKernel(nextIterationSetUp_program, "kernel_ocl_path_trace_SetupNextIteration_SPLIT_KERNEL", &ciErr);
+ ckPathTraceKernel_SetUpNextIteration = clCreateKernel(nextIterationSetUp_program, "kernel_ocl_path_trace_SetupNextIteration_SPLIT_KERNEL", &ciErr);
if(opencl_error(ciErr))
return false;
- ckPathTraceKernel_SumAllRadiance_SPLIT_KERNEL = clCreateKernel(sumAllRadiance_program, "kernel_ocl_path_trace_SumAllRadiance_SPLIT_KERNEL", &ciErr);
+ ckPathTraceKernel_SumAllRadiance = clCreateKernel(sumAllRadiance_program, "kernel_ocl_path_trace_SumAllRadiance_SPLIT_KERNEL", &ciErr);
if(opencl_error(ciErr))
return false;
@@ -2058,38 +2058,38 @@ public:
task_pool.stop();
/* Release kernels */
- if(ckPathTraceKernel_DataInit_SPLIT_KERNEL)
- clReleaseKernel(ckPathTraceKernel_DataInit_SPLIT_KERNEL);
+ if(ckPathTraceKernel_DataInit)
+ clReleaseKernel(ckPathTraceKernel_DataInit);
- if(ckPathTraceKernel_SceneIntersect_SPLIT_KERNEL)
- clReleaseKernel(ckPathTraceKernel_SceneIntersect_SPLIT_KERNEL);
+ if(ckPathTraceKernel_SceneIntersect)
+ clReleaseKernel(ckPathTraceKernel_SceneIntersect);
- if(ckPathTraceKernel_LampEmission_SPLIT_KERNEL)
- clReleaseKernel(ckPathTraceKernel_LampEmission_SPLIT_KERNEL);
+ if(ckPathTraceKernel_LampEmission)
+ clReleaseKernel(ckPathTraceKernel_LampEmission);
- if(ckPathTraceKernel_QueueEnqueue_SPLIT_KERNEL)
- clReleaseKernel(ckPathTraceKernel_QueueEnqueue_SPLIT_KERNEL);
+ if(ckPathTraceKernel_QueueEnqueue)
+ clReleaseKernel(ckPathTraceKernel_QueueEnqueue);
- if(ckPathTraceKernel_BG_BufferUpdate_SPLIT_KERNEL)
- clReleaseKernel(ckPathTraceKernel_BG_BufferUpdate_SPLIT_KERNEL);
+ if(ckPathTraceKernel_BG_BufferUpdate)
+ clReleaseKernel(ckPathTraceKernel_BG_BufferUpdate);
- if(ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL)
- clReleaseKernel(ckPathTraceKernel_Shader_Lighting_SPLIT_KERNEL);
+ if(ckPathTraceKernel_Shader_Lighting)
+ clReleaseKernel(ckPathTraceKernel_Shader_Lighting);
- if(ckPathTraceKernel_Holdout_Emission_Blurring_Pathtermination_AO_SPLIT_KERNEL)
- clReleaseKernel(ckPathTraceKernel_Holdout_Emission_Blurring_Pathtermination_AO_SPLIT_KERNEL);
+ if(ckPathTraceKernel_Holdout_Emission_Blurring_Pathtermination_AO)
+ clReleaseKernel(ckPathTraceKernel_Holdout_Emission_Blurring_Pathtermination_AO);
- if(ckPathTraceKernel_DirectLighting_SPLIT_KERNEL)
- clReleaseKernel(ckPathTraceKernel_DirectLighting_SPLIT_KERNEL);
+ if(ckPathTraceKernel_DirectLighting)
+ clReleaseKernel(ckPathTraceKernel_DirectLighting);
- if(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL)
- clReleaseKernel(ckPathTraceKernel_ShadowBlocked_DirectLighting_SPLIT_KERNEL);
+ if(ckPathTraceKernel_ShadowBlocked_DirectLighting)
+ clReleaseKernel(ckPathTraceKernel_ShadowBlocked_DirectLighting);
- if(ckPathTraceKernel_SetUpNextIteration_SPLIT_KERNEL)
- clReleaseKernel(ckPathTraceKernel_SetUpNextIteration_SPLIT_KERNEL);
+ if(ckPathTraceKernel_SetUpNextIteration)
+ clReleaseKernel(ckPathTraceKernel_SetUpNextIteration);
- if(ckPathTraceKernel_SumAllRadiance_SPLIT_KERNEL)
- clReleaseKernel(ckPathTraceKernel_SumAllRadiance_SPLIT_KERNEL);
+ if(ckPathTraceKernel_SumAllRadiance)
+ clReleaseKernel(ckPathTraceKernel_SumAllRadiance);
/* Release global memory */
if(P_sd != NULL)
@@ -2545,305 +2545,305 @@ public:
cl_int dQueue_size = global_size[0] * global_size[1];
cl_int total_num_rays = global_size[0] * global_size[1];
- /* Set arguments for ckPathTraceKernel_DataInit_SPLIT_KERNEL kernel */
+ /* 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_SPLIT_KERNEL, kgbuffer);
- KERNEL_APPEND_ARG(ckPathTraceKernel_D
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list