Cycles: remove prefix from source code file names

Remove prefix of filenames that is the same as the folder name. This used
to help when #includes were using individual files, but now they are always
relative to the cycles root directory and so the prefixes are redundant.

For patches and branches, git merge and rebase should be able to detect the
renames and move over code to the right file.

10 files changed, 36 insertions, 36 deletions

diff --git a/intern/cycles/kernel/device/cpu/compat.h b/intern/cycles/kernel/device/cpu/compat.h
index 888c0d5d872..5ccca52255f 100644
--- a/intern/cycles/kernel/device/cpu/compat.h
+++ b/intern/cycles/kernel/device/cpu/compat.h
@@ -26,11 +26,11 @@
 #  pragma GCC diagnostic ignored "-Wuninitialized"
 #endif
 
-#include "util/util_half.h"
-#include "util/util_math.h"
-#include "util/util_simd.h"
-#include "util/util_texture.h"
-#include "util/util_types.h"
+#include "util/half.h"
+#include "util/math.h"
+#include "util/simd.h"
+#include "util/texture.h"
+#include "util/types.h"
 
 /* On x86_64, versions of glibc < 2.16 have an issue where expf is
  * much slower than the double version.  This was fixed in glibc 2.16.
diff --git a/intern/cycles/kernel/device/cpu/globals.h b/intern/cycles/kernel/device/cpu/globals.h
index f3e530a9edc..dd0327b3f94 100644
--- a/intern/cycles/kernel/device/cpu/globals.h
+++ b/intern/cycles/kernel/device/cpu/globals.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include "kernel/kernel_types.h"
-#include "kernel/util/util_profiling.h"
+#include "kernel/types.h"
+#include "kernel/util/profiling.h"
 
 CCL_NAMESPACE_BEGIN
 
@@ -36,7 +36,7 @@ struct OSLShadingSystem;
 
 typedef struct KernelGlobalsCPU {
 #define KERNEL_TEX(type, name) texture<type> name;
-#include "kernel/kernel_textures.h"
+#include "kernel/textures.h"
 
   KernelData __data;
 
diff --git a/intern/cycles/kernel/device/cpu/kernel.cpp b/intern/cycles/kernel/device/cpu/kernel.cpp
index 8519b77aa08..a16c637d5ac 100644
--- a/intern/cycles/kernel/device/cpu/kernel.cpp
+++ b/intern/cycles/kernel/device/cpu/kernel.cpp
@@ -85,7 +85,7 @@ void kernel_global_memory_copy(KernelGlobalsCPU *kg, const char *name, void *mem
     kg->tname.data = (type *)mem; \
     kg->tname.width = size; \
   }
-#include "kernel/kernel_textures.h"
+#include "kernel/textures.h"
   else {
     assert(0);
   }
diff --git a/intern/cycles/kernel/device/cpu/kernel.h b/intern/cycles/kernel/device/cpu/kernel.h
index 28337a58898..c49d7ca445a 100644
--- a/intern/cycles/kernel/device/cpu/kernel.h
+++ b/intern/cycles/kernel/device/cpu/kernel.h
@@ -18,9 +18,9 @@
 
 /* CPU Kernel Interface */
 
-#include "util/util_types.h"
+#include "util/types.h"
 
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/device/cpu/kernel_arch_impl.h b/intern/cycles/kernel/device/cpu/kernel_arch_impl.h
index 148b6a33cb5..6df5d7787fc 100644
--- a/intern/cycles/kernel/device/cpu/kernel_arch_impl.h
+++ b/intern/cycles/kernel/device/cpu/kernel_arch_impl.h
@@ -29,26 +29,26 @@
 #    include "kernel/device/cpu/globals.h"
 #    include "kernel/device/cpu/image.h"
 
-#    include "kernel/integrator/integrator_state.h"
-#    include "kernel/integrator/integrator_state_flow.h"
-#    include "kernel/integrator/integrator_state_util.h"
-
-#    include "kernel/integrator/integrator_init_from_camera.h"
-#    include "kernel/integrator/integrator_init_from_bake.h"
-#    include "kernel/integrator/integrator_intersect_closest.h"
-#    include "kernel/integrator/integrator_intersect_shadow.h"
-#    include "kernel/integrator/integrator_intersect_subsurface.h"
-#    include "kernel/integrator/integrator_intersect_volume_stack.h"
-#    include "kernel/integrator/integrator_shade_background.h"
-#    include "kernel/integrator/integrator_shade_light.h"
-#    include "kernel/integrator/integrator_shade_shadow.h"
-#    include "kernel/integrator/integrator_shade_surface.h"
-#    include "kernel/integrator/integrator_shade_volume.h"
-#    include "kernel/integrator/integrator_megakernel.h"
-
-#    include "kernel/film/film_adaptive_sampling.h"
-#    include "kernel/film/film_read.h"
-#    include "kernel/film/film_id_passes.h"
+#    include "kernel/integrator/state.h"
+#    include "kernel/integrator/state_flow.h"
+#    include "kernel/integrator/state_util.h"
+
+#    include "kernel/integrator/init_from_camera.h"
+#    include "kernel/integrator/init_from_bake.h"
+#    include "kernel/integrator/intersect_closest.h"
+#    include "kernel/integrator/intersect_shadow.h"
+#    include "kernel/integrator/intersect_subsurface.h"
+#    include "kernel/integrator/intersect_volume_stack.h"
+#    include "kernel/integrator/shade_background.h"
+#    include "kernel/integrator/shade_light.h"
+#    include "kernel/integrator/shade_shadow.h"
+#    include "kernel/integrator/shade_surface.h"
+#    include "kernel/integrator/shade_volume.h"
+#    include "kernel/integrator/megakernel.h"
+
+#    include "kernel/film/adaptive_sampling.h"
+#    include "kernel/film/read.h"
+#    include "kernel/film/id_passes.h"
 
 #    include "kernel/bake/bake.h"
 
diff --git a/intern/cycles/kernel/device/cpu/kernel_avx.cpp b/intern/cycles/kernel/device/cpu/kernel_avx.cpp
index 220768036ab..cece750a255 100644
--- a/intern/cycles/kernel/device/cpu/kernel_avx.cpp
+++ b/intern/cycles/kernel/device/cpu/kernel_avx.cpp
@@ -18,7 +18,7 @@
  * optimization flags and nearly all functions inlined, while kernel.cpp
  * is compiled without for other CPU's. */
 
-#include "util/util_optimization.h"
+#include "util/optimization.h"
 
 #ifndef WITH_CYCLES_OPTIMIZED_KERNEL_AVX
 #  define KERNEL_STUB
diff --git a/intern/cycles/kernel/device/cpu/kernel_avx2.cpp b/intern/cycles/kernel/device/cpu/kernel_avx2.cpp
index 90c05113cbe..fad4581236e 100644
--- a/intern/cycles/kernel/device/cpu/kernel_avx2.cpp
+++ b/intern/cycles/kernel/device/cpu/kernel_avx2.cpp
@@ -18,7 +18,7 @@
  * optimization flags and nearly all functions inlined, while kernel.cpp
  * is compiled without for other CPU's. */
 
-#include "util/util_optimization.h"
+#include "util/optimization.h"
 
 #ifndef WITH_CYCLES_OPTIMIZED_KERNEL_AVX2
 #  define KERNEL_STUB
diff --git a/intern/cycles/kernel/device/cpu/kernel_sse2.cpp b/intern/cycles/kernel/device/cpu/kernel_sse2.cpp
index fb85ef5b0d0..5fb4849ac08 100644
--- a/intern/cycles/kernel/device/cpu/kernel_sse2.cpp
+++ b/intern/cycles/kernel/device/cpu/kernel_sse2.cpp
@@ -18,7 +18,7 @@
  * optimization flags and nearly all functions inlined, while kernel.cpp
  * is compiled without for other CPU's. */
 
-#include "util/util_optimization.h"
+#include "util/optimization.h"
 
 #ifndef WITH_CYCLES_OPTIMIZED_KERNEL_SSE2
 #  define KERNEL_STUB
diff --git a/intern/cycles/kernel/device/cpu/kernel_sse3.cpp b/intern/cycles/kernel/device/cpu/kernel_sse3.cpp
index 87baf04258a..c9424682fd4 100644
--- a/intern/cycles/kernel/device/cpu/kernel_sse3.cpp
+++ b/intern/cycles/kernel/device/cpu/kernel_sse3.cpp
@@ -18,7 +18,7 @@
  * optimization flags and nearly all functions inlined, while kernel.cpp
  * is compiled without for other CPU's. */
 
-#include "util/util_optimization.h"
+#include "util/optimization.h"
 
 #ifndef WITH_CYCLES_OPTIMIZED_KERNEL_SSE3
 #  define KERNEL_STUB
diff --git a/intern/cycles/kernel/device/cpu/kernel_sse41.cpp b/intern/cycles/kernel/device/cpu/kernel_sse41.cpp
index bb421d58815..849ebf51989 100644
--- a/intern/cycles/kernel/device/cpu/kernel_sse41.cpp
+++ b/intern/cycles/kernel/device/cpu/kernel_sse41.cpp
@@ -18,7 +18,7 @@
  * optimization flags and nearly all functions inlined, while kernel.cpp
  * is compiled without for other CPU's. */
 
-#include "util/util_optimization.h"
+#include "util/optimization.h"
 
 #ifndef WITH_CYCLES_OPTIMIZED_KERNEL_SSE41
 #  define KERNEL_STUB