[Bf-blender-cvs] [4246898ad30] master: Cleanup: move function parameter to member

[Manuel Castilla]

Commit: 4246898ad301b2a51dae5102be53b05e8d23e362
Author: Manuel Castilla
Date:   Mon Jun 21 13:09:40 2021 +0200
Branches: master
https://developer.blender.org/rB4246898ad301b2a51dae5102be53b05e8d23e362

Cleanup: move function parameter to member

Get current pass only when needed.

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

M	source/blender/compositor/intern/COM_MultiThreadedOperation.cc
M	source/blender/compositor/intern/COM_MultiThreadedOperation.h

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

diff --git a/source/blender/compositor/intern/COM_MultiThreadedOperation.cc b/source/blender/compositor/intern/COM_MultiThreadedOperation.cc
index c54c2edccb0..b080f44d02d 100644
--- a/source/blender/compositor/intern/COM_MultiThreadedOperation.cc
+++ b/source/blender/compositor/intern/COM_MultiThreadedOperation.cc
@@ -6,6 +6,7 @@ namespace blender::compositor {
 MultiThreadedOperation::MultiThreadedOperation()
 {
   m_num_passes = 1;
+  current_pass_ = 0;
   flags.is_fullframe_operation = true;
 }
 
@@ -14,12 +15,12 @@ void MultiThreadedOperation::update_memory_buffer(MemoryBuffer *output,
                                                   blender::Span<MemoryBuffer *> inputs,
                                                   ExecutionSystem &exec_system)
 {
-  for (int current_pass = 0; current_pass < m_num_passes; current_pass++) {
-    update_memory_buffer_started(output, output_area, inputs, exec_system, current_pass);
+  for (current_pass_ = 0; current_pass_ < m_num_passes; current_pass_++) {
+    update_memory_buffer_started(output, output_area, inputs, exec_system);
     exec_system.execute_work(output_area, [=, &exec_system](const rcti &split_rect) {
-      update_memory_buffer_partial(output, split_rect, inputs, exec_system, current_pass);
+      update_memory_buffer_partial(output, split_rect, inputs, exec_system);
     });
-    update_memory_buffer_finished(output, output_area, inputs, exec_system, current_pass);
+    update_memory_buffer_finished(output, output_area, inputs, exec_system);
   }
 }
 
diff --git a/source/blender/compositor/intern/COM_MultiThreadedOperation.h b/source/blender/compositor/intern/COM_MultiThreadedOperation.h
index 97c5fba4ead..6b8a2f273b7 100644
--- a/source/blender/compositor/intern/COM_MultiThreadedOperation.h
+++ b/source/blender/compositor/intern/COM_MultiThreadedOperation.h
@@ -28,6 +28,10 @@ class MultiThreadedOperation : public NodeOperation {
    * Number of execution passes.
    */
   int m_num_passes;
+  /**
+   * Current execution pass.
+   */
+  int current_pass_;
 
  protected:
   MultiThreadedOperation();
@@ -38,8 +42,7 @@ class MultiThreadedOperation : public NodeOperation {
   virtual void update_memory_buffer_started(MemoryBuffer *UNUSED(output),
                                             const rcti &UNUSED(output_rect),
                                             blender::Span<MemoryBuffer *> UNUSED(inputs),
-                                            ExecutionSystem &UNUSED(exec_system),
-                                            int UNUSED(current_pass))
+                                            ExecutionSystem &UNUSED(exec_system))
   {
   }
 
@@ -49,8 +52,7 @@ class MultiThreadedOperation : public NodeOperation {
   virtual void update_memory_buffer_partial(MemoryBuffer *output,
                                             const rcti &output_rect,
                                             blender::Span<MemoryBuffer *> inputs,
-                                            ExecutionSystem &exec_system,
-                                            int current_pass) = 0;
+                                            ExecutionSystem &exec_system) = 0;
 
   /**
    * Called after an update memory buffer pass is executed. Single-threaded calls.
@@ -58,8 +60,7 @@ class MultiThreadedOperation : public NodeOperation {
   virtual void update_memory_buffer_finished(MemoryBuffer *UNUSED(output),
                                              const rcti &UNUSED(output_rect),
                                              blender::Span<MemoryBuffer *> UNUSED(inputs),
-                                             ExecutionSystem &UNUSED(exec_system),
-                                             int UNUSED(current_pass))
+                                             ExecutionSystem &UNUSED(exec_system))
   {
   }