[Bf-blender-cvs] [8f4d9915940] master: Cleanup: remove unused parameter

Manuel Castilla noreply at git.blender.org
Wed Jun 23 17:55:42 CEST 2021


Commit: 8f4d99159404621a9063f4bd155a519baf51f313
Author: Manuel Castilla
Date:   Wed Jun 23 17:19:06 2021 +0200
Branches: master
https://developer.blender.org/rB8f4d99159404621a9063f4bd155a519baf51f313

Cleanup: remove unused parameter

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

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 aebc3d5671c..e6e98d69b36 100644
--- a/source/blender/compositor/intern/COM_MultiThreadedOperation.cc
+++ b/source/blender/compositor/intern/COM_MultiThreadedOperation.cc
@@ -16,11 +16,11 @@ void MultiThreadedOperation::update_memory_buffer(MemoryBuffer *output,
                                                   ExecutionSystem &exec_system)
 {
   for (current_pass_ = 0; current_pass_ < num_passes_; current_pass_++) {
-    update_memory_buffer_started(output, area, inputs, exec_system);
-    exec_system.execute_work(area, [=, &exec_system](const rcti &split_rect) {
-      update_memory_buffer_partial(output, split_rect, inputs, exec_system);
+    update_memory_buffer_started(output, area, inputs);
+    exec_system.execute_work(area, [=](const rcti &split_rect) {
+      update_memory_buffer_partial(output, split_rect, inputs);
     });
-    update_memory_buffer_finished(output, area, inputs, exec_system);
+    update_memory_buffer_finished(output, area, inputs);
   }
 }
 
diff --git a/source/blender/compositor/intern/COM_MultiThreadedOperation.h b/source/blender/compositor/intern/COM_MultiThreadedOperation.h
index d30201a7dcf..ad09c4df089 100644
--- a/source/blender/compositor/intern/COM_MultiThreadedOperation.h
+++ b/source/blender/compositor/intern/COM_MultiThreadedOperation.h
@@ -41,8 +41,7 @@ class MultiThreadedOperation : public NodeOperation {
    */
   virtual void update_memory_buffer_started(MemoryBuffer *UNUSED(output),
                                             const rcti &UNUSED(area),
-                                            Span<MemoryBuffer *> UNUSED(inputs),
-                                            ExecutionSystem &UNUSED(exec_system))
+                                            Span<MemoryBuffer *> UNUSED(inputs))
   {
   }
 
@@ -51,16 +50,14 @@ class MultiThreadedOperation : public NodeOperation {
    */
   virtual void update_memory_buffer_partial(MemoryBuffer *output,
                                             const rcti &area,
-                                            Span<MemoryBuffer *> inputs,
-                                            ExecutionSystem &exec_system) = 0;
+                                            Span<MemoryBuffer *> inputs) = 0;
 
   /**
    * Called after an update memory buffer pass is executed. Single-threaded calls.
    */
   virtual void update_memory_buffer_finished(MemoryBuffer *UNUSED(output),
                                              const rcti &UNUSED(area),
-                                             Span<MemoryBuffer *> UNUSED(inputs),
-                                             ExecutionSystem &UNUSED(exec_system))
+                                             Span<MemoryBuffer *> UNUSED(inputs))
   {
   }



More information about the Bf-blender-cvs mailing list