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.

12 files changed, 17 insertions, 23 deletions

diff --git a/intern/cycles/test/CMakeLists.txt b/intern/cycles/test/CMakeLists.txt
index efd9cecb877..86a830b2b65 100644
--- a/intern/cycles/test/CMakeLists.txt
+++ b/intern/cycles/test/CMakeLists.txt
@@ -20,13 +20,7 @@ if(WITH_GTESTS)
 endif()
 
 set(INC
-  .
   ..
-  ../device
-  ../graph
-  ../kernel
-  ../scene
-  ../util
 )
 
 set(ALL_CYCLES_LIBRARIES
diff --git a/intern/cycles/test/integrator_adaptive_sampling_test.cpp b/intern/cycles/test/integrator_adaptive_sampling_test.cpp
index 3ed6a23125d..30688605e44 100644
--- a/intern/cycles/test/integrator_adaptive_sampling_test.cpp
+++ b/intern/cycles/test/integrator_adaptive_sampling_test.cpp
@@ -17,7 +17,7 @@
 #include "testing/testing.h"
 
 #include "integrator/adaptive_sampling.h"
-#include "util/util_vector.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/test/integrator_tile_test.cpp b/intern/cycles/test/integrator_tile_test.cpp
index 5bb57b48c3c..e5ffa7c153d 100644
--- a/intern/cycles/test/integrator_tile_test.cpp
+++ b/intern/cycles/test/integrator_tile_test.cpp
@@ -17,7 +17,7 @@
 #include "testing/testing.h"
 
 #include "integrator/tile.h"
-#include "util/util_math.h"
+#include "util/math.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/test/render_graph_finalize_test.cpp b/intern/cycles/test/render_graph_finalize_test.cpp
index 4a87a382130..4207b437a41 100644
--- a/intern/cycles/test/render_graph_finalize_test.cpp
+++ b/intern/cycles/test/render_graph_finalize_test.cpp
@@ -23,11 +23,11 @@
 #include "scene/shader_graph.h"
 #include "scene/shader_nodes.h"
 
-#include "util/util_array.h"
-#include "util/util_logging.h"
-#include "util/util_stats.h"
-#include "util/util_string.h"
-#include "util/util_vector.h"
+#include "util/array.h"
+#include "util/log.h"
+#include "util/stats.h"
+#include "util/string.h"
+#include "util/vector.h"
 
 using testing::_;
 using testing::AnyNumber;
diff --git a/intern/cycles/test/util_aligned_malloc_test.cpp b/intern/cycles/test/util_aligned_malloc_test.cpp
index 8829c422a0f..2748db520eb 100644
--- a/intern/cycles/test/util_aligned_malloc_test.cpp
+++ b/intern/cycles/test/util_aligned_malloc_test.cpp
@@ -16,7 +16,7 @@
 
 #include "testing/testing.h"
 
-#include "util/util_aligned_malloc.h"
+#include "util/aligned_malloc.h"
 
 #define CHECK_ALIGNMENT(ptr, align) EXPECT_EQ((size_t)ptr % align, 0)
 
diff --git a/intern/cycles/test/util_avxf_test.h b/intern/cycles/test/util_avxf_test.h
index 64825200c9e..b178a0450d0 100644
--- a/intern/cycles/test/util_avxf_test.h
+++ b/intern/cycles/test/util_avxf_test.h
@@ -15,8 +15,8 @@
  */
 
 #include "testing/testing.h"
-#include "util/util_system.h"
-#include "util/util_types.h"
+#include "util/system.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/test/util_math_test.cpp b/intern/cycles/test/util_math_test.cpp
index b6ce3ef0cf3..adbedf7adbe 100644
--- a/intern/cycles/test/util_math_test.cpp
+++ b/intern/cycles/test/util_math_test.cpp
@@ -16,7 +16,7 @@
 
 #include "testing/testing.h"
 
-#include "util/util_math.h"
+#include "util/math.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/test/util_path_test.cpp b/intern/cycles/test/util_path_test.cpp
index 76d48dc241d..7afdd1150a4 100644
--- a/intern/cycles/test/util_path_test.cpp
+++ b/intern/cycles/test/util_path_test.cpp
@@ -16,7 +16,7 @@
 
 #include "testing/testing.h"
 
-#include "util/util_path.h"
+#include "util/path.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/test/util_string_test.cpp b/intern/cycles/test/util_string_test.cpp
index c9022d1b132..f558dda9e47 100644
--- a/intern/cycles/test/util_string_test.cpp
+++ b/intern/cycles/test/util_string_test.cpp
@@ -16,7 +16,7 @@
 
 #include "testing/testing.h"
 
-#include "util/util_string.h"
+#include "util/string.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/test/util_task_test.cpp b/intern/cycles/test/util_task_test.cpp
index a8b4dfc3a37..17cfe4ff9b2 100644
--- a/intern/cycles/test/util_task_test.cpp
+++ b/intern/cycles/test/util_task_test.cpp
@@ -16,7 +16,7 @@
 
 #include "testing/testing.h"
 
-#include "util/util_task.h"
+#include "util/task.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/test/util_time_test.cpp b/intern/cycles/test/util_time_test.cpp
index ab5ead2c7b1..97a0134df67 100644
--- a/intern/cycles/test/util_time_test.cpp
+++ b/intern/cycles/test/util_time_test.cpp
@@ -16,7 +16,7 @@
 
 #include "testing/testing.h"
 
-#include "util/util_time.h"
+#include "util/time.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/test/util_transform_test.cpp b/intern/cycles/test/util_transform_test.cpp
index a5267df9fb7..11dd71ea0c2 100644
--- a/intern/cycles/test/util_transform_test.cpp
+++ b/intern/cycles/test/util_transform_test.cpp
@@ -16,8 +16,8 @@
 
 #include "testing/testing.h"
 
-#include "util/util_transform.h"
-#include "util/util_vector.h"
+#include "util/transform.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN