[Bf-blender-cvs] [19da44f869c] master: Cleanup: remove internal functions from interface.

Jeroen Bakker noreply at git.blender.org
Tue Mar 23 12:11:54 CET 2021


Commit: 19da44f869c7c98904b235a3e1501d2165c021b3
Author: Jeroen Bakker
Date:   Tue Mar 23 12:03:55 2021 +0100
Branches: master
https://developer.blender.org/rB19da44f869c7c98904b235a3e1501d2165c021b3

Cleanup: remove internal functions from interface.

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

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

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

diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cc b/source/blender/compositor/intern/COM_WorkScheduler.cc
index 71f062ed5bf..5d3f232221f 100644
--- a/source/blender/compositor/intern/COM_WorkScheduler.cc
+++ b/source/blender/compositor/intern/COM_WorkScheduler.cc
@@ -74,7 +74,7 @@ static struct {
 } g_work_scheduler;
 
 #if COM_CURRENT_THREADING_MODEL == COM_TM_QUEUE
-void *WorkScheduler::thread_execute_cpu(void *data)
+static void *thread_execute_cpu(void *data)
 {
   CPUDevice *device = (CPUDevice *)data;
   WorkPackage *work;
@@ -87,7 +87,7 @@ void *WorkScheduler::thread_execute_cpu(void *data)
   return nullptr;
 }
 
-void *WorkScheduler::thread_execute_gpu(void *data)
+static void *thread_execute_gpu(void *data)
 {
   Device *device = (Device *)data;
   WorkPackage *work;
diff --git a/source/blender/compositor/intern/COM_WorkScheduler.h b/source/blender/compositor/intern/COM_WorkScheduler.h
index dbfa97a2238..6b53cc3efd6 100644
--- a/source/blender/compositor/intern/COM_WorkScheduler.h
+++ b/source/blender/compositor/intern/COM_WorkScheduler.h
@@ -28,21 +28,6 @@
  * \ingroup execution
  */
 struct WorkScheduler {
-
-#if COM_CURRENT_THREADING_MODEL == COM_TM_QUEUE
-  /**
-   * \brief main thread loop for cpudevices
-   * inside this loop new work is queried and being executed
-   */
-  static void *thread_execute_cpu(void *data);
-
-  /**
-   * \brief main thread loop for gpudevices
-   * inside this loop new work is queried and being executed
-   */
-  static void *thread_execute_gpu(void *data);
-#endif
- public:
   /**
    * \brief schedule a chunk of a group to be calculated.
    * An execution group schedules a chunk in the WorkScheduler



More information about the Bf-blender-cvs mailing list