[Bf-blender-cvs] [fdc8a4d] cycles_kernel_split: Cycles kernel split: Finish kernel files rename

Sergey Sharybin noreply at git.blender.org
Sat May 9 12:13:50 CEST 2015


Commit: fdc8a4d4eac02864ba1c7c8014d65161da7d1113
Author: Sergey Sharybin
Date:   Sat May 9 15:10:34 2015 +0500
Branches: cycles_kernel_split
https://developer.blender.org/rBfdc8a4d4eac02864ba1c7c8014d65161da7d1113

Cycles kernel split: Finish kernel files rename

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

M	intern/cycles/device/device_opencl.cpp

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

diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index fe7c549..21c523d 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -1958,18 +1958,18 @@ public:
 		/* TODO(sergey): If names are unified we can save some more bits of
 		 * code here.
 		 */
-		LOAD_KERNEL(dataInit_program, "DataInit");
-		LOAD_KERNEL(sceneIntersect_program, "SceneIntersect");
-		LOAD_KERNEL(lampEmission_program, "LampEmission");
-		LOAD_KERNEL(QueueEnqueue_program, "QueueEnqueue");
-		LOAD_KERNEL(background_BufferUpdate_program, "Background_BufferUpdate");
-		LOAD_KERNEL(shaderEval_program, "ShaderEval");
+		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(holdout_emission_blurring_termination_ao_program,
-		            "Holdout_Emission_Blurring_Pathtermination_AO");
-		LOAD_KERNEL(directLighting_program, "DirectLighting");
-		LOAD_KERNEL(shadowBlocked_program, "ShadowBlocked");
-		LOAD_KERNEL(nextIterationSetUp_program, "NextIterationSetUp");
-		LOAD_KERNEL(sumAllRadiance_program, "SumAllRadiance");
+		            "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");
 
 #undef LOAD_KERNEL




More information about the Bf-blender-cvs mailing list