From c91d4ccbeb32eb4981b3e1e89a336e7fb159f9f6 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 19 May 2014 14:57:55 +0200 Subject: [PATCH] Code refactor: rename kernel_displace.h to kernel_bake.h. --- intern/cycles/kernel/CMakeLists.txt | 2 +- intern/cycles/kernel/kernel.cl | 2 +- intern/cycles/kernel/kernel.cpp | 2 +- intern/cycles/kernel/kernel.cu | 2 +- intern/cycles/kernel/kernel_avx.cpp | 2 +- intern/cycles/kernel/{kernel_displace.h => kernel_bake.h} | 0 intern/cycles/kernel/kernel_sse2.cpp | 2 +- intern/cycles/kernel/kernel_sse3.cpp | 2 +- intern/cycles/kernel/kernel_sse41.cpp | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) rename intern/cycles/kernel/{kernel_displace.h => kernel_bake.h} (100%) diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index d18f4fa2998..994fba7a1d3 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -19,12 +19,12 @@ set(SRC set(SRC_HEADERS kernel.h kernel_accumulate.h + kernel_bake.h kernel_camera.h kernel_compat_cpu.h kernel_compat_cuda.h kernel_compat_opencl.h kernel_differential.h - kernel_displace.h kernel_emission.h kernel_film.h kernel_globals.h diff --git a/intern/cycles/kernel/kernel.cl b/intern/cycles/kernel/kernel.cl index 6988ad6027f..1dc0793a7bc 100644 --- a/intern/cycles/kernel/kernel.cl +++ b/intern/cycles/kernel/kernel.cl @@ -23,7 +23,7 @@ #include "kernel_film.h" #include "kernel_path.h" -#include "kernel_displace.h" +#include "kernel_bake.h" __kernel void kernel_ocl_path_trace( ccl_constant KernelData *data, diff --git a/intern/cycles/kernel/kernel.cpp b/intern/cycles/kernel/kernel.cpp index 173028d50c8..a0b6b8e13d0 100644 --- a/intern/cycles/kernel/kernel.cpp +++ b/intern/cycles/kernel/kernel.cpp @@ -23,7 +23,7 @@ #include "kernel_globals.h" #include "kernel_film.h" #include "kernel_path.h" -#include "kernel_displace.h" +#include "kernel_bake.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/kernel.cu b/intern/cycles/kernel/kernel.cu index 636e48b5456..b9b41f755ba 100644 --- a/intern/cycles/kernel/kernel.cu +++ b/intern/cycles/kernel/kernel.cu @@ -22,7 +22,7 @@ #include "kernel_globals.h" #include "kernel_film.h" #include "kernel_path.h" -#include "kernel_displace.h" +#include "kernel_bake.h" /* device data taken from CUDA occupancy calculator */ diff --git a/intern/cycles/kernel/kernel_avx.cpp b/intern/cycles/kernel/kernel_avx.cpp index 354214c406e..c572fcd3df6 100644 --- a/intern/cycles/kernel/kernel_avx.cpp +++ b/intern/cycles/kernel/kernel_avx.cpp @@ -37,7 +37,7 @@ #include "kernel_globals.h" #include "kernel_film.h" #include "kernel_path.h" -#include "kernel_displace.h" +#include "kernel_bake.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/kernel_displace.h b/intern/cycles/kernel/kernel_bake.h similarity index 100% rename from intern/cycles/kernel/kernel_displace.h rename to intern/cycles/kernel/kernel_bake.h diff --git a/intern/cycles/kernel/kernel_sse2.cpp b/intern/cycles/kernel/kernel_sse2.cpp index 2d5f6091908..455cac046a3 100644 --- a/intern/cycles/kernel/kernel_sse2.cpp +++ b/intern/cycles/kernel/kernel_sse2.cpp @@ -34,7 +34,7 @@ #include "kernel_globals.h" #include "kernel_film.h" #include "kernel_path.h" -#include "kernel_displace.h" +#include "kernel_bake.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/kernel_sse3.cpp b/intern/cycles/kernel/kernel_sse3.cpp index 1062fd0c990..29aca52890e 100644 --- a/intern/cycles/kernel/kernel_sse3.cpp +++ b/intern/cycles/kernel/kernel_sse3.cpp @@ -36,7 +36,7 @@ #include "kernel_globals.h" #include "kernel_film.h" #include "kernel_path.h" -#include "kernel_displace.h" +#include "kernel_bake.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/kernel_sse41.cpp b/intern/cycles/kernel/kernel_sse41.cpp index ba3b4887650..0ece67e6d2b 100644 --- a/intern/cycles/kernel/kernel_sse41.cpp +++ b/intern/cycles/kernel/kernel_sse41.cpp @@ -37,7 +37,7 @@ #include "kernel_globals.h" #include "kernel_film.h" #include "kernel_path.h" -#include "kernel_displace.h" +#include "kernel_bake.h" CCL_NAMESPACE_BEGIN