[Bf-blender-cvs] [66547740edb] cycles-x: Cycles X: Move pass accessor to integrator folder

[Sergey Sharybin]

Commit: 66547740edb10d8e155a16688ca7fb6cd8cdf341
Author: Sergey Sharybin
Date:   Mon May 31 15:05:43 2021 +0200
Branches: cycles-x
https://developer.blender.org/rB66547740edb10d8e155a16688ca7fb6cd8cdf341

Cycles X: Move pass accessor to integrator folder

This is where it is used the most and will be used even more in the
future.

No functional changes, preparing for an upcoming generalization of
the class. Eventually this class will take over the kernel film
convert kernel, for which DeviceQueue will be needed, so it makes
sense to move the pass accessor to the integrator folder

Differential Revision: https://developer.blender.org/D11476

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

M	intern/cycles/integrator/CMakeLists.txt
R099	intern/cycles/render/pass_accessor.cpp	intern/cycles/integrator/pass_accessor.cpp
R100	intern/cycles/render/pass_accessor.h	intern/cycles/integrator/pass_accessor.h
M	intern/cycles/integrator/path_trace.cpp
M	intern/cycles/render/CMakeLists.txt
M	intern/cycles/render/session.cpp

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

diff --git a/intern/cycles/integrator/CMakeLists.txt b/intern/cycles/integrator/CMakeLists.txt
index 3156ef3a440..e2497e80352 100644
--- a/intern/cycles/integrator/CMakeLists.txt
+++ b/intern/cycles/integrator/CMakeLists.txt
@@ -24,6 +24,7 @@ set(SRC
   denoiser_optix.cpp
   path_trace.cpp
   tile.cpp
+  pass_accessor.cpp
   path_trace_work.cpp
   path_trace_work_cpu.cpp
   path_trace_work_gpu.cpp
@@ -40,6 +41,7 @@ set(SRC_HEADERS
   denoiser_optix.h
   path_trace.h
   tile.h
+  pass_accessor.h
   path_trace_work.h
   path_trace_work_cpu.h
   path_trace_work_gpu.h
diff --git a/intern/cycles/render/pass_accessor.cpp b/intern/cycles/integrator/pass_accessor.cpp
similarity index 99%
rename from intern/cycles/render/pass_accessor.cpp
rename to intern/cycles/integrator/pass_accessor.cpp
index c0fa57b0a57..e5d91772109 100644
--- a/intern/cycles/render/pass_accessor.cpp
+++ b/intern/cycles/integrator/pass_accessor.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "render/pass_accessor.h"
+#include "integrator/pass_accessor.h"
 
 #include "render/buffers.h"
 #include "util/util_logging.h"
diff --git a/intern/cycles/render/pass_accessor.h b/intern/cycles/integrator/pass_accessor.h
similarity index 100%
rename from intern/cycles/render/pass_accessor.h
rename to intern/cycles/integrator/pass_accessor.h
diff --git a/intern/cycles/integrator/path_trace.cpp b/intern/cycles/integrator/path_trace.cpp
index 4b3c131c252..096dec4d812 100644
--- a/intern/cycles/integrator/path_trace.cpp
+++ b/intern/cycles/integrator/path_trace.cpp
@@ -17,9 +17,9 @@
 #include "integrator/path_trace.h"
 
 #include "device/device.h"
+#include "integrator/pass_accessor.h"
 #include "integrator/render_scheduler.h"
 #include "render/gpu_display.h"
-#include "render/pass_accessor.h"
 #include "util/util_algorithm.h"
 #include "util/util_logging.h"
 #include "util/util_progress.h"
diff --git a/intern/cycles/render/CMakeLists.txt b/intern/cycles/render/CMakeLists.txt
index e1713161fcb..87770664811 100644
--- a/intern/cycles/render/CMakeLists.txt
+++ b/intern/cycles/render/CMakeLists.txt
@@ -56,7 +56,6 @@ set(SRC
   osl.cpp
   particles.cpp
   pass.cpp
-  pass_accessor.cpp
   curves.cpp
   scene.cpp
   session.cpp
@@ -100,7 +99,6 @@ set(SRC_HEADERS
   osl.h
   particles.h
   pass.h
-  pass_accessor.h
   procedural.h
   curves.h
   scene.h
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 7a8732c23b9..2ffa429a602 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -18,6 +18,7 @@
 #include <string.h>
 
 #include "device/device.h"
+#include "integrator/pass_accessor.h"
 #include "integrator/path_trace.h"
 #include "render/bake.h"
 #include "render/buffers.h"
@@ -28,7 +29,6 @@
 #include "render/light.h"
 #include "render/mesh.h"
 #include "render/object.h"
-#include "render/pass_accessor.h"
 #include "render/scene.h"
 #include "render/session.h"