[Bf-blender-cvs] [24fd1b3] cycles_kernel_split: fix kernel names some more

Martijn Berger noreply at git.blender.org
Sat May 9 14:16:46 CEST 2015


Commit: 24fd1b39b58050e29caf09af0675cff1d5c851cc
Author: Martijn Berger
Date:   Sat May 9 14:14:04 2015 +0200
Branches: cycles_kernel_split
https://developer.blender.org/rB24fd1b39b58050e29caf09af0675cff1d5c851cc

fix kernel names some more

===================================================================

M	intern/cycles/device/device_opencl.cpp
M	intern/cycles/kernel/kernel_background_buffer_update.cl
M	intern/cycles/kernel/kernel_direct_lighting.cl
M	intern/cycles/kernel/kernel_holdout_emission_blurring_pathtermination_ao.cl
M	intern/cycles/kernel/kernel_lamp_emission.cl
M	intern/cycles/kernel/kernel_next_iteration_setup.cl
M	intern/cycles/kernel/kernel_queue_enqueue.cl
M	intern/cycles/kernel/kernel_scene_intersect.cl
M	intern/cycles/kernel/kernel_shader_eval.cl
M	intern/cycles/kernel/kernel_shadow_blocked.cl
M	intern/cycles/kernel/kernel_sum_all_radiance.cl

===================================================================

diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index 5496abc..8918537 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -1490,30 +1490,30 @@ class OpenCLDeviceSplitKernel : public OpenCLDeviceBase
 {
 public:
 	/* Kernel declaration. */
-	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_kernel ckPathTraceKernel_data_init;
+	cl_kernel ckPathTraceKernel_scene_intersect;
+	cl_kernel ckPathTraceKernel_lamp_emission;
+	cl_kernel ckPathTraceKernel_queue_enqueue;
+	cl_kernel ckPathTraceKernel_background_buffer_update;
+	cl_kernel ckPathTraceKernel_shader_lighting;
+	cl_kernel ckPathTraceKernel_holdout_emission_blurring_pathtermination_ao;
+	cl_kernel ckPathTraceKernel_direct_lighting;
+	cl_kernel ckPathTraceKernel_shadow_blocked_direct_lighting;
+	cl_kernel ckPathTraceKernel_setup_next_iteration;
+	cl_kernel ckPathTraceKernel_sum_all_radiance;
 
 	/* cl_program declaration. */
-	cl_program dataInit_program;
-	cl_program sceneIntersect_program;
-	cl_program lampEmission_program;
-	cl_program QueueEnqueue_program;
-	cl_program background_BufferUpdate_program;
-	cl_program shaderEval_program;
+	cl_program data_init_program;
+	cl_program scene_intersect_program;
+	cl_program lamp_emission_program;
+	cl_program queue_enqueue_program;
+	cl_program background_buffer_update_program;
+	cl_program shader_eval_program;
 	cl_program holdout_emission_blurring_termination_ao_program;
-	cl_program directLighting_program;
-	cl_program shadowBlocked_program;
-	cl_program nextIterationSetUp_program;
-	cl_program sumAllRadiance_program;
+	cl_program direct_lighting_program;
+	cl_program shadow_blocked_program;
+	cl_program next_iteration_setup_program;
+	cl_program sum_all_radiance_program;
 
 	/* Global memory variables [porting]; These memory is used for
 	 * co-operation between different kernels; Data written by one
@@ -1532,7 +1532,7 @@ public:
 	/* Global buffers for ShaderData. */
 	cl_mem sd;             /* ShaderData used in the main path-iteration loop. */
 	cl_mem sd_DL_shadow;   /* ShaderData used in Direct Lighting and
-	                        * ShadowBlocked kernel.
+	                        * shadow_blocked kernel.
 	                        */
 
 	/* Global buffers of each member of ShaderData. */
@@ -1668,30 +1668,30 @@ public:
 		background = background_;
 
 		/* Initialize kernels. */
-		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;
+		ckPathTraceKernel_data_init = NULL;
+		ckPathTraceKernel_scene_intersect = NULL;
+		ckPathTraceKernel_lamp_emission = NULL;
+		ckPathTraceKernel_background_buffer_update = NULL;
+		ckPathTraceKernel_shader_lighting = NULL;
+		ckPathTraceKernel_holdout_emission_blurring_pathtermination_ao = NULL;
+		ckPathTraceKernel_direct_lighting = NULL;
+		ckPathTraceKernel_shadow_blocked_direct_lighting = NULL;
+		ckPathTraceKernel_setup_next_iteration = NULL;
+		ckPathTraceKernel_sum_all_radiance = NULL;
+		ckPathTraceKernel_queue_enqueue = NULL;
 
 		/* Initialize program. */
-		dataInit_program = NULL;
-		sceneIntersect_program = NULL;
-		lampEmission_program = NULL;
-		QueueEnqueue_program = NULL;
-		background_BufferUpdate_program = NULL;
-		shaderEval_program = NULL;
+		data_init_program = NULL;
+		scene_intersect_program = NULL;
+		lamp_emission_program = NULL;
+		queue_enqueue_program = NULL;
+		background_buffer_update_program = NULL;
+		shader_eval_program = NULL;
 		holdout_emission_blurring_termination_ao_program = NULL;
-		directLighting_program = NULL;
-		shadowBlocked_program = NULL;
-		nextIterationSetUp_program = NULL;
-		sumAllRadiance_program = NULL;
+		direct_lighting_program = NULL;
+		shadow_blocked_program = NULL;
+		next_iteration_setup_program = NULL;
+		sum_all_radiance_program = NULL;
 
 		/* Initialize cl_mem variables. */
 		kgbuffer = NULL;
@@ -2014,18 +2014,18 @@ public:
 		/* TODO(sergey): If names are unified we can save some more bits of
 		 * code here.
 		 */
-		LOAD_KERNEL(dataInit_program, "data_init");
-		LOAD_KERNEL(sceneIntersect_program, "scene_intersect");
-		LOAD_KERNEL(lampEmission_program, "lamp_emission");
-		LOAD_KERNEL(QueueEnqueue_program, "queue_enqueue");
-		LOAD_KERNEL(background_BufferUpdate_program, "background_buffer_update");
-		LOAD_KERNEL(shaderEval_program, "shader_eval");
+		LOAD_KERNEL(data_init_program, "data_init");
+		LOAD_KERNEL(scene_intersect_program, "scene_intersect");
+		LOAD_KERNEL(lamp_emission_program, "lamp_emission");
+		LOAD_KERNEL(queue_enqueue_program, "queue_enqueue");
+		LOAD_KERNEL(background_buffer_update_program, "background_buffer_update");
+		LOAD_KERNEL(shader_eval_program, "shader_eval");
 		LOAD_KERNEL(holdout_emission_blurring_termination_ao_program,
 		            "holdout_emission_blurring_pathtermination_ao");
-		LOAD_KERNEL(directLighting_program, "direct_lighting");
-		LOAD_KERNEL(shadowBlocked_program, "shadow_blocked");
-		LOAD_KERNEL(nextIterationSetUp_program, "next_iteration_setup");
-		LOAD_KERNEL(sumAllRadiance_program, "sum_all_radiance");
+		LOAD_KERNEL(direct_lighting_program, "direct_lighting");
+		LOAD_KERNEL(shadow_blocked_program, "shadow_blocked");
+		LOAD_KERNEL(next_iteration_setup_program, "next_iteration_setup");
+		LOAD_KERNEL(sum_all_radiance_program, "sum_all_radiance");
 
 #undef LOAD_KERNEL
 
@@ -2040,19 +2040,19 @@ public:
 		} \
 	} while(false)
 
-		FIND_KERNEL(DataInit, dataInit, "data_initialization");
-		FIND_KERNEL(SceneIntersect, sceneIntersect, "SceneIntersect");
-		FIND_KERNEL(LampEmission, lampEmission, "LampEmission");
-		FIND_KERNEL(QueueEnqueue, QueueEnqueue, "QueueEnqueue");
-		FIND_KERNEL(BG_BufferUpdate, background_BufferUpdate, "Background_BufferUpdate");
-		FIND_KERNEL(Shader_Lighting, shaderEval, "ShaderEvaluation");
-		FIND_KERNEL(Holdout_Emission_Blurring_Pathtermination_AO,
+		FIND_KERNEL(data_init, data_init, "data_initialization");
+		FIND_KERNEL(scene_intersect, scene_intersect, "scene_intersect");
+		FIND_KERNEL(lamp_emission, lamp_emission, "lamp_emission");
+		FIND_KERNEL(queue_enqueue, queue_enqueue, "queue_enqueue");
+		FIND_KERNEL(background_buffer_update, background_buffer_update, "background_buffer_update");
+		FIND_KERNEL(shader_lighting, shader_eval, "shader_evaluation");
+		FIND_KERNEL(holdout_emission_blurring_pathtermination_ao,
 		            holdout_emission_blurring_termination_ao,
-		            "holdout_emission_blurring_pathtermination_AO");
-		FIND_KERNEL(DirectLighting, directLighting, "DirectLighting");
-		FIND_KERNEL(ShadowBlocked_DirectLighting, shadowBlocked, "ShadowBlocked_DirectLighting");
-		FIND_KERNEL(SetUpNextIteration, nextIterationSetUp, "SetupNextIteration");
-		FIND_KERNEL(SumAllRadiance, sumAllRadiance, "SumAllRadiance");
+		            "holdout_emission_blurring_pathtermination_ao");
+		FIND_KERNEL(direct_lighting, direct_lighting, "direct_lighting");
+		FIND_KERNEL(shadow_blocked_direct_lighting, shadow_blocked, "shadow_blocked_direct_lighting");
+		FIND_KERNEL(setup_next_iteration, next_iteration_setup, "setup_next_iteration");
+		FIND_KERNEL(sum_all_radiance, sum_all_radiance, "sum_all_radiance");
 #undef FIND_KERNEL
 #undef GLUE
 
@@ -2066,17 +2066,17 @@ public:
 		task_pool.stop();
 
 		/* Release kernels */
-		release_kernel_safe(ckPathTraceKernel_DataInit);
-		release_kernel_safe(ckPathTraceKernel_SceneIntersect);
-		release_kernel_safe(ckPathTraceKernel_LampEmission);
-		release_kernel_safe(ckPathTraceKernel_QueueEnqueue);
-		release_kernel_safe(ckPathTraceKernel_BG_BufferUpdate);
-		release_kernel_safe(ckPathTraceKernel_Shader_Lighting);
-		release_kernel_safe(ckPathTraceKernel_Holdout_Emission_Blurring_Pathtermination_AO);
-		release_kernel_safe(ckPathTraceKernel_DirectLighting);
-		release_kernel_safe(ckPathTraceKernel_ShadowBlocked_DirectLighting);
-		release_kernel_safe(ckPathTraceKernel_SetUpNextIteration);
-		release_kernel_safe(ckPathTraceKernel_SumAllRadiance);
+		release_kernel_safe(ckPathTraceKernel_data_init);
+		release_kernel_safe(ckPathTraceKernel_scene_intersect);
+		release_kernel_safe(ckPathTraceKernel_lamp_emission);
+		release_kernel_safe(ckPathTraceKernel_queue_enqueue);
+		release_kernel_safe(ckPathTraceKernel_background_buffer_update);
+		release_kernel_safe(ckPathTraceKernel_shader_lighting);
+		release_kernel_safe(ckPathTraceKernel_holdout_emission_blurring_pathtermination_ao);
+		release_kernel_safe(ckPathTraceKernel_direct_lighting);
+		release_kernel_safe(ckPathTraceKernel_shadow_blocked_direct_lighting);
+		release_kernel_safe(ckPathTraceKernel_setup_next_iteration);
+		release_kernel_safe(ckPathTraceKernel_sum_all_radiance);
 
 		/* Release global memory */
 		release_mem_object_safe(P_sd);
@@ -2167,17 +2167,17 @@ public:
 		release_mem_object_safe(per_sample_output_buffers);
 
 		/* Release programs */
-		release_program_safe(dataInit_program);
-		release_program_safe(sceneIntersect_program);
-		release_program_safe(lampEmission_program);
-		release_program_safe(QueueEnqueue_program);
-		release_program_safe(background_BufferUpdate_program);
-		release_program_safe(shaderEval_program);
+		release_program_safe(data_init_program);
+		release_program_safe(scene_intersect_program);
+		release_program_safe(lamp_emission_program);
+		release_program_safe(queue_enqueue_pro

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list