Cycles: changes to source code folders structure

* Split render/ into scene/ and session/. The scene/ folder now contains the
  scene and its nodes. The session/ folder contains the render session and
  associated data structures like drivers and render buffers.
* Move top level kernel headers into new folders kernel/camera/, kernel/film/,
  kernel/light/, kernel/sample/, kernel/util/
* Move integrator related kernel headers into kernel/integrator/
* Move OSL shaders from kernel/shaders/ to kernel/osl/shaders/

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

21 files changed, 36 insertions, 34 deletions

diff --git a/intern/cycles/integrator/CMakeLists.txt b/intern/cycles/integrator/CMakeLists.txt
index 949254606b8..dedde513409 100644
--- a/intern/cycles/integrator/CMakeLists.txt
+++ b/intern/cycles/integrator/CMakeLists.txt
@@ -61,9 +61,11 @@ set(SRC_HEADERS
 )
 
 set(LIB
+  cycles_device
+
   # NOTE: Is required for RenderBuffers access. Might consider moving files around a bit to
   # avoid such cyclic dependency.
-  cycles_render
+  cycles_session
 
   cycles_util
 )
diff --git a/intern/cycles/integrator/denoiser.cpp b/intern/cycles/integrator/denoiser.cpp
index 598bbd497a5..45f967b38eb 100644
--- a/intern/cycles/integrator/denoiser.cpp
+++ b/intern/cycles/integrator/denoiser.cpp
@@ -19,7 +19,7 @@
 #include "device/device.h"
 #include "integrator/denoiser_oidn.h"
 #include "integrator/denoiser_optix.h"
-#include "render/buffers.h"
+#include "session/buffers.h"
 #include "util/util_logging.h"
 #include "util/util_progress.h"
 
diff --git a/intern/cycles/integrator/denoiser_device.cpp b/intern/cycles/integrator/denoiser_device.cpp
index e8361c50f2f..1afd8d46866 100644
--- a/intern/cycles/integrator/denoiser_device.cpp
+++ b/intern/cycles/integrator/denoiser_device.cpp
@@ -20,7 +20,7 @@
 #include "device/device_denoise.h"
 #include "device/device_memory.h"
 #include "device/device_queue.h"
-#include "render/buffers.h"
+#include "session/buffers.h"
 #include "util/util_logging.h"
 #include "util/util_progress.h"
 
diff --git a/intern/cycles/integrator/denoiser_oidn.cpp b/intern/cycles/integrator/denoiser_oidn.cpp
index cc9a3f51387..c3555008699 100644
--- a/intern/cycles/integrator/denoiser_oidn.cpp
+++ b/intern/cycles/integrator/denoiser_oidn.cpp
@@ -21,7 +21,7 @@
 #include "device/device.h"
 #include "device/device_queue.h"
 #include "integrator/pass_accessor_cpu.h"
-#include "render/buffers.h"
+#include "session/buffers.h"
 #include "util/util_array.h"
 #include "util/util_logging.h"
 #include "util/util_openimagedenoise.h"
diff --git a/intern/cycles/integrator/pass_accessor.cpp b/intern/cycles/integrator/pass_accessor.cpp
index 1308b03b06c..0a8c445eca7 100644
--- a/intern/cycles/integrator/pass_accessor.cpp
+++ b/intern/cycles/integrator/pass_accessor.cpp
@@ -16,7 +16,7 @@
 
 #include "integrator/pass_accessor.h"
 
-#include "render/buffers.h"
+#include "session/buffers.h"
 #include "util/util_logging.h"
 
 // clang-format off
diff --git a/intern/cycles/integrator/pass_accessor.h b/intern/cycles/integrator/pass_accessor.h
index 624bf7d0b2c..c9cf3ba8956 100644
--- a/intern/cycles/integrator/pass_accessor.h
+++ b/intern/cycles/integrator/pass_accessor.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "render/pass.h"
+#include "scene/pass.h"
 #include "util/util_half.h"
 #include "util/util_string.h"
 #include "util/util_types.h"
diff --git a/intern/cycles/integrator/pass_accessor_cpu.cpp b/intern/cycles/integrator/pass_accessor_cpu.cpp
index e3cb81d31b7..f3ca38c667d 100644
--- a/intern/cycles/integrator/pass_accessor_cpu.cpp
+++ b/intern/cycles/integrator/pass_accessor_cpu.cpp
@@ -16,7 +16,7 @@
 
 #include "integrator/pass_accessor_cpu.h"
 
-#include "render/buffers.h"
+#include "session/buffers.h"
 #include "util/util_logging.h"
 #include "util/util_tbb.h"
 
@@ -24,7 +24,7 @@
 #include "kernel/device/cpu/compat.h"
 #include "kernel/device/cpu/globals.h"
 #include "kernel/kernel_types.h"
-#include "kernel/kernel_film.h"
+#include "kernel/film/film_read.h"
 // clang-format on
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/integrator/pass_accessor_gpu.cpp b/intern/cycles/integrator/pass_accessor_gpu.cpp
index 7b01d061708..3b4290a89e6 100644
--- a/intern/cycles/integrator/pass_accessor_gpu.cpp
+++ b/intern/cycles/integrator/pass_accessor_gpu.cpp
@@ -17,7 +17,7 @@
 #include "integrator/pass_accessor_gpu.h"
 
 #include "device/device_queue.h"
-#include "render/buffers.h"
+#include "session/buffers.h"
 #include "util/util_logging.h"
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/integrator/path_trace.cpp b/intern/cycles/integrator/path_trace.cpp
index 9f3049c6484..94687f7bc95 100644
--- a/intern/cycles/integrator/path_trace.cpp
+++ b/intern/cycles/integrator/path_trace.cpp
@@ -22,9 +22,9 @@
 #include "integrator/path_trace_display.h"
 #include "integrator/path_trace_tile.h"
 #include "integrator/render_scheduler.h"
-#include "render/pass.h"
-#include "render/scene.h"
-#include "render/tile.h"
+#include "scene/pass.h"
+#include "scene/scene.h"
+#include "session/tile.h"
 #include "util/util_algorithm.h"
 #include "util/util_logging.h"
 #include "util/util_progress.h"
diff --git a/intern/cycles/integrator/path_trace.h b/intern/cycles/integrator/path_trace.h
index dbb22c204d9..89fa5fa8eaf 100644
--- a/intern/cycles/integrator/path_trace.h
+++ b/intern/cycles/integrator/path_trace.h
@@ -20,7 +20,7 @@
 #include "integrator/pass_accessor.h"
 #include "integrator/path_trace_work.h"
 #include "integrator/work_balancer.h"
-#include "render/buffers.h"
+#include "session/buffers.h"
 #include "util/util_function.h"
 #include "util/util_thread.h"
 #include "util/util_unique_ptr.h"
diff --git a/intern/cycles/integrator/path_trace_display.cpp b/intern/cycles/integrator/path_trace_display.cpp
index e22989bb301..7455a107ae6 100644
--- a/intern/cycles/integrator/path_trace_display.cpp
+++ b/intern/cycles/integrator/path_trace_display.cpp
@@ -16,7 +16,7 @@
 
 #include "integrator/path_trace_display.h"
 
-#include "render/buffers.h"
+#include "session/buffers.h"
 
 #include "util/util_logging.h"
 
diff --git a/intern/cycles/integrator/path_trace_display.h b/intern/cycles/integrator/path_trace_display.h
index 99d2e0e1203..d40e45e7ead 100644
--- a/intern/cycles/integrator/path_trace_display.h
+++ b/intern/cycles/integrator/path_trace_display.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "render/display_driver.h"
+#include "session/display_driver.h"
 
 #include "util/util_half.h"
 #include "util/util_thread.h"
diff --git a/intern/cycles/integrator/path_trace_tile.cpp b/intern/cycles/integrator/path_trace_tile.cpp
index 540f4aa5f68..4834769f476 100644
--- a/intern/cycles/integrator/path_trace_tile.cpp
+++ b/intern/cycles/integrator/path_trace_tile.cpp
@@ -18,10 +18,10 @@
 #include "integrator/pass_accessor_cpu.h"
 #include "integrator/path_trace.h"
 
-#include "render/buffers.h"
-#include "render/film.h"
-#include "render/pass.h"
-#include "render/scene.h"
+#include "scene/film.h"
+#include "scene/pass.h"
+#include "scene/scene.h"
+#include "session/buffers.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/path_trace_tile.h b/intern/cycles/integrator/path_trace_tile.h
index fd3e2969f6c..6c7bddf2ca5 100644
--- a/intern/cycles/integrator/path_trace_tile.h
+++ b/intern/cycles/integrator/path_trace_tile.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "render/output_driver.h"
+#include "session/output_driver.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/path_trace_work.cpp b/intern/cycles/integrator/path_trace_work.cpp
index d46f095d0d7..e08c410a579 100644
--- a/intern/cycles/integrator/path_trace_work.cpp
+++ b/intern/cycles/integrator/path_trace_work.cpp
@@ -20,9 +20,9 @@
 #include "integrator/path_trace_work.h"
 #include "integrator/path_trace_work_cpu.h"
 #include "integrator/path_trace_work_gpu.h"
-#include "render/buffers.h"
-#include "render/film.h"
-#include "render/scene.h"
+#include "scene/film.h"
+#include "scene/scene.h"
+#include "session/buffers.h"
 
 #include "kernel/kernel_types.h"
 
diff --git a/intern/cycles/integrator/path_trace_work.h b/intern/cycles/integrator/path_trace_work.h
index 404165b7c55..6b2a6c71e81 100644
--- a/intern/cycles/integrator/path_trace_work.h
+++ b/intern/cycles/integrator/path_trace_work.h
@@ -17,8 +17,8 @@
 #pragma once
 
 #include "integrator/pass_accessor.h"
-#include "render/buffers.h"
-#include "render/pass.h"
+#include "scene/pass.h"
+#include "session/buffers.h"
 #include "util/util_types.h"
 #include "util/util_unique_ptr.h"
 
diff --git a/intern/cycles/integrator/path_trace_work_cpu.cpp b/intern/cycles/integrator/path_trace_work_cpu.cpp
index 1cadcd9ec5c..1e59682a64c 100644
--- a/intern/cycles/integrator/path_trace_work_cpu.cpp
+++ b/intern/cycles/integrator/path_trace_work_cpu.cpp
@@ -19,13 +19,13 @@
 #include "device/cpu/kernel.h"
 #include "device/device.h"
 
-#include "kernel/kernel_path_state.h"
+#include "kernel/integrator/integrator_path_state.h"
 
 #include "integrator/pass_accessor_cpu.h"
 #include "integrator/path_trace_display.h"
 
-#include "render/buffers.h"
-#include "render/scene.h"
+#include "scene/scene.h"
+#include "session/buffers.h"
 
 #include "util/util_atomic.h"
 #include "util/util_logging.h"
diff --git a/intern/cycles/integrator/path_trace_work_gpu.cpp b/intern/cycles/integrator/path_trace_work_gpu.cpp
index 775cee57a90..67e5ae70316 100644
--- a/intern/cycles/integrator/path_trace_work_gpu.cpp
+++ b/intern/cycles/integrator/path_trace_work_gpu.cpp
@@ -20,8 +20,8 @@
 #include "device/device.h"
 
 #include "integrator/pass_accessor_gpu.h"
-#include "render/buffers.h"
-#include "render/scene.h"
+#include "scene/scene.h"
+#include "session/buffers.h"
 #include "util/util_logging.h"
 #include "util/util_string.h"
 #include "util/util_tbb.h"
diff --git a/intern/cycles/integrator/render_scheduler.cpp b/intern/cycles/integrator/render_scheduler.cpp
index 322d3d5f94c..3c64cba5feb 100644
--- a/intern/cycles/integrator/render_scheduler.cpp
+++ b/intern/cycles/integrator/render_scheduler.cpp
@@ -16,8 +16,8 @@
 
 #include "integrator/render_scheduler.h"
 
-#include "render/session.h"
-#include "render/tile.h"
+#include "session/session.h"
+#include "session/tile.h"
 #include "util/util_logging.h"
 #include "util/util_math.h"
 #include "util/util_time.h"
diff --git a/intern/cycles/integrator/render_scheduler.h b/intern/cycles/integrator/render_scheduler.h
index c4ab15e54ba..a2c1e75d3b6 100644
--- a/intern/cycles/integrator/render_scheduler.h
+++ b/intern/cycles/integrator/render_scheduler.h
@@ -18,7 +18,7 @@
 
 #include "integrator/adaptive_sampling.h"
 #include "integrator/denoiser.h" /* For DenoiseParams. */
-#include "render/buffers.h"
+#include "session/buffers.h"
 #include "util/util_string.h"
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/integrator/work_tile_scheduler.cpp b/intern/cycles/integrator/work_tile_scheduler.cpp
index 234b1fae915..a6775f27b65 100644
--- a/intern/cycles/integrator/work_tile_scheduler.cpp
+++ b/intern/cycles/integrator/work_tile_scheduler.cpp
@@ -18,7 +18,7 @@
 
 #include "device/device_queue.h"
 #include "integrator/tile.h"
-#include "render/buffers.h"
+#include "session/buffers.h"
 #include "util/util_atomic.h"
 #include "util/util_logging.h"