[Bf-blender-cvs] [0c0ed35] cycles_kernel_split: Rename opencl entry points

Martijn Berger noreply at git.blender.org
Sat May 9 11:51:29 CEST 2015


Commit: 0c0ed35790054fdfe73c7108f0f0bd3be0910961
Author: Martijn Berger
Date:   Sat May 9 11:51:03 2015 +0200
Branches: cycles_kernel_split
https://developer.blender.org/rB0c0ed35790054fdfe73c7108f0f0bd3be0910961

Rename opencl entry points

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

M	intern/cycles/kernel/CMakeLists.txt
D	intern/cycles/kernel/kernel_Background_BufferUpdate.cl
D	intern/cycles/kernel/kernel_DataInit.cl
D	intern/cycles/kernel/kernel_DirectLighting.cl
D	intern/cycles/kernel/kernel_Holdout_Emission_Blurring_Pathtermination_AO.cl
D	intern/cycles/kernel/kernel_LampEmission.cl
D	intern/cycles/kernel/kernel_NextIterationSetUp.cl
D	intern/cycles/kernel/kernel_QueueEnqueue.cl
D	intern/cycles/kernel/kernel_SceneIntersect.cl
D	intern/cycles/kernel/kernel_ShaderEval.cl
D	intern/cycles/kernel/kernel_ShadowBlocked.cl
D	intern/cycles/kernel/kernel_SumAllRadiance.cl
A	intern/cycles/kernel/kernel_background_buffer_update.cl
A	intern/cycles/kernel/kernel_data_init.cl
A	intern/cycles/kernel/kernel_direct_lighting.cl
A	intern/cycles/kernel/kernel_holdout_emission_blurring_pathtermination_ao.cl
A	intern/cycles/kernel/kernel_lamp_emission.cl
A	intern/cycles/kernel/kernel_next_iteration_setup.cl
A	intern/cycles/kernel/kernel_queue_enqueue.cl
A	intern/cycles/kernel/kernel_scene_intersect.cl
A	intern/cycles/kernel/kernel_shader_eval.cl
A	intern/cycles/kernel/kernel_shadow_blocked.cl
A	intern/cycles/kernel/kernel_sum_all_radiance.cl

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

diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index c6336c0..85b2760 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -14,17 +14,17 @@ set(INC_SYS
 set(SRC
 	kernel.cpp
 	kernel.cl
-	kernel_DataInit.cl
-	kernel_QueueEnqueue.cl
-	kernel_SceneIntersect.cl
-	kernel_LampEmission.cl
-	kernel_Background_BufferUpdate.cl
-	kernel_ShaderEval.cl
-	kernel_Holdout_Emission_Blurring_Pathtermination_AO.cl
-	kernel_DirectLighting.cl
-	kernel_ShadowBlocked.cl
-	kernel_NextIterationSetUp.cl
-	kernel_SumAllRadiance.cl
+	kernel_data_init.cl
+	kernel_queue_enqueue.cl
+	kernel_scene_intersect.cl
+	kernel_lamp_emission.cl
+	kernel_background_buffer_update.cl
+	kernel_shader_eval.cl
+	kernel_holdout_emission_blurring_pathtermination_ao.cl
+	kernel_direct_lighting.cl
+	kernel_shadow_blocked.cl
+	kernel_next_iteration_setup.cl
+	kernel_sum_all_radiance.cl
 	kernel.cu
 )
 
@@ -301,17 +301,17 @@ endif()
 #delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${KERNEL_PREPROCESSED}" ${CYCLES_INSTALL_PATH}/kernel)
 
 delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel.cl" ${CYCLES_INSTALL_PATH}/kernel)
-delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_DataInit.cl" ${CYCLES_INSTALL_PATH}/kernel)
-delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_QueueEnqueue.cl" ${CYCLES_INSTALL_PATH}/kernel)
-delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_SceneIntersect.cl" ${CYCLES_INSTALL_PATH}/kernel)
-delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_LampEmission.cl" ${CYCLES_INSTALL_PATH}/kernel)
-delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_Background_BufferUpdate.cl" ${CYCLES_INSTALL_PATH}/kernel)
-delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_ShaderEval.cl" ${CYCLES_INSTALL_PATH}/kernel)
-delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_Holdout_Emission_Blurring_Pathtermination_AO.cl" ${CYCLES_INSTALL_PATH}/kernel)
-delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_DirectLighting.cl" ${CYCLES_INSTALL_PATH}/kernel)
-delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_ShadowBlocked.cl" ${CYCLES_INSTALL_PATH}/kernel)
-delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_NextIterationSetUp.cl" ${CYCLES_INSTALL_PATH}/kernel)
-delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_SumAllRadiance.cl" ${CYCLES_INSTALL_PATH}/kernel)
+delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_data_init.cl" ${CYCLES_INSTALL_PATH}/kernel)
+delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_queue_enqueue.cl" ${CYCLES_INSTALL_PATH}/kernel)
+delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_scene_intersect.cl" ${CYCLES_INSTALL_PATH}/kernel)
+delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_lamp_emission.cl" ${CYCLES_INSTALL_PATH}/kernel)
+delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_background_buffer_update.cl" ${CYCLES_INSTALL_PATH}/kernel)
+delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_shader_eval.cl" ${CYCLES_INSTALL_PATH}/kernel)
+delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_holdout_emission_blurring_pathtermination_ao.cl" ${CYCLES_INSTALL_PATH}/kernel)
+delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_direct_lighting.cl" ${CYCLES_INSTALL_PATH}/kernel)
+delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_shadow_blocked.cl" ${CYCLES_INSTALL_PATH}/kernel)
+delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_next_iteration_setup.cl" ${CYCLES_INSTALL_PATH}/kernel)
+delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_sum_all_radiance.cl" ${CYCLES_INSTALL_PATH}/kernel)
 delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel.cu" ${CYCLES_INSTALL_PATH}/kernel)
 delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel)
 delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_CLOSURE_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel/closure)
diff --git a/intern/cycles/kernel/kernel_Background_BufferUpdate.cl b/intern/cycles/kernel/kernel_background_buffer_update.cl
similarity index 100%
rename from intern/cycles/kernel/kernel_Background_BufferUpdate.cl
rename to intern/cycles/kernel/kernel_background_buffer_update.cl
diff --git a/intern/cycles/kernel/kernel_DataInit.cl b/intern/cycles/kernel/kernel_data_init.cl
similarity index 100%
rename from intern/cycles/kernel/kernel_DataInit.cl
rename to intern/cycles/kernel/kernel_data_init.cl
diff --git a/intern/cycles/kernel/kernel_DirectLighting.cl b/intern/cycles/kernel/kernel_direct_lighting.cl
similarity index 100%
rename from intern/cycles/kernel/kernel_DirectLighting.cl
rename to intern/cycles/kernel/kernel_direct_lighting.cl
diff --git a/intern/cycles/kernel/kernel_Holdout_Emission_Blurring_Pathtermination_AO.cl b/intern/cycles/kernel/kernel_holdout_emission_blurring_pathtermination_ao.cl
similarity index 100%
rename from intern/cycles/kernel/kernel_Holdout_Emission_Blurring_Pathtermination_AO.cl
rename to intern/cycles/kernel/kernel_holdout_emission_blurring_pathtermination_ao.cl
diff --git a/intern/cycles/kernel/kernel_LampEmission.cl b/intern/cycles/kernel/kernel_lamp_emission.cl
similarity index 100%
rename from intern/cycles/kernel/kernel_LampEmission.cl
rename to intern/cycles/kernel/kernel_lamp_emission.cl
diff --git a/intern/cycles/kernel/kernel_NextIterationSetUp.cl b/intern/cycles/kernel/kernel_next_iteration_setup.cl
similarity index 100%
rename from intern/cycles/kernel/kernel_NextIterationSetUp.cl
rename to intern/cycles/kernel/kernel_next_iteration_setup.cl
diff --git a/intern/cycles/kernel/kernel_QueueEnqueue.cl b/intern/cycles/kernel/kernel_queue_enqueue.cl
similarity index 100%
rename from intern/cycles/kernel/kernel_QueueEnqueue.cl
rename to intern/cycles/kernel/kernel_queue_enqueue.cl
diff --git a/intern/cycles/kernel/kernel_SceneIntersect.cl b/intern/cycles/kernel/kernel_scene_intersect.cl
similarity index 100%
rename from intern/cycles/kernel/kernel_SceneIntersect.cl
rename to intern/cycles/kernel/kernel_scene_intersect.cl
diff --git a/intern/cycles/kernel/kernel_ShaderEval.cl b/intern/cycles/kernel/kernel_shader_eval.cl
similarity index 100%
rename from intern/cycles/kernel/kernel_ShaderEval.cl
rename to intern/cycles/kernel/kernel_shader_eval.cl
diff --git a/intern/cycles/kernel/kernel_ShadowBlocked.cl b/intern/cycles/kernel/kernel_shadow_blocked.cl
similarity index 100%
rename from intern/cycles/kernel/kernel_ShadowBlocked.cl
rename to intern/cycles/kernel/kernel_shadow_blocked.cl
diff --git a/intern/cycles/kernel/kernel_SumAllRadiance.cl b/intern/cycles/kernel/kernel_sum_all_radiance.cl
similarity index 100%
rename from intern/cycles/kernel/kernel_SumAllRadiance.cl
rename to intern/cycles/kernel/kernel_sum_all_radiance.cl




More information about the Bf-blender-cvs mailing list