[Bf-blender-cvs] [c36d8516b02] temp-geometry-nodes-evaluator-refactor: cleanup

[Jacques Lucke]

Commit: c36d8516b02f10e1979ea3b53ba9c182ede84130
Author: Jacques Lucke
Date:   Tue Sep 6 17:46:13 2022 +0200
Branches: temp-geometry-nodes-evaluator-refactor
https://developer.blender.org/rBc36d8516b02f10e1979ea3b53ba9c182ede84130

cleanup

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

M	source/blender/functions/FN_lazy_function_graph_executor.hh
M	source/blender/functions/intern/lazy_function_graph_executor.cc
M	source/blender/nodes/NOD_geometry_nodes_to_lazy_function_graph.hh

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

diff --git a/source/blender/functions/FN_lazy_function_graph_executor.hh b/source/blender/functions/FN_lazy_function_graph_executor.hh
index 677ee87a8b9..14470936804 100644
--- a/source/blender/functions/FN_lazy_function_graph_executor.hh
+++ b/source/blender/functions/FN_lazy_function_graph_executor.hh
@@ -20,17 +20,20 @@ class LazyFunctionGraphExecutionLogger {
 };
 
 class LazyFunctionGraphExecutor : public LazyFunction {
+ public:
+  using Logger = LazyFunctionGraphExecutionLogger;
+
  private:
   const LazyFunctionGraph &graph_;
   VectorSet<const OutputSocket *> graph_inputs_;
   VectorSet<const InputSocket *> graph_outputs_;
-  const LazyFunctionGraphExecutionLogger *logger_;
+  const Logger *logger_;
 
  public:
   LazyFunctionGraphExecutor(const LazyFunctionGraph &graph,
                             Span<const OutputSocket *> graph_inputs,
                             Span<const InputSocket *> graph_outputs,
-                            const LazyFunctionGraphExecutionLogger *logger);
+                            const Logger *logger);
 
   void *init_storage(LinearAllocator<> &allocator) const override;
   void destruct_storage(void *storage) const override;
diff --git a/source/blender/functions/intern/lazy_function_graph_executor.cc b/source/blender/functions/intern/lazy_function_graph_executor.cc
index 33c0a52b9e1..788f14f3b03 100644
--- a/source/blender/functions/intern/lazy_function_graph_executor.cc
+++ b/source/blender/functions/intern/lazy_function_graph_executor.cc
@@ -181,7 +181,7 @@ class Executor {
   /**
    * Optional logger for events that happen during execution.
    */
-  const LazyFunctionGraphExecutionLogger *logger_;
+  const LazyFunctionGraphExecutor::Logger *logger_;
   /**
    * Remembers which inputs have been loaded from the caller already, to avoid loading them twice.
    * Atomics are used to make sure that every input is only retrieved once.
@@ -216,7 +216,7 @@ class Executor {
   Executor(const LazyFunctionGraph &graph,
            const VectorSet<const OutputSocket *> &graph_inputs,
            const VectorSet<const InputSocket *> &graph_outputs,
-           const LazyFunctionGraphExecutionLogger *logger)
+           const LazyFunctionGraphExecutor::Logger *logger)
       : graph_(graph),
         graph_inputs_(graph_inputs),
         graph_outputs_(graph_outputs),
@@ -988,11 +988,10 @@ void Executor::execute_node(const FunctionNode &node,
   fn.execute(node_params, fn_context);
 }
 
-LazyFunctionGraphExecutor::LazyFunctionGraphExecutor(
-    const LazyFunctionGraph &graph,
-    Span<const OutputSocket *> graph_inputs,
-    Span<const InputSocket *> graph_outputs,
-    const LazyFunctionGraphExecutionLogger *logger)
+LazyFunctionGraphExecutor::LazyFunctionGraphExecutor(const LazyFunctionGraph &graph,
+                                                     Span<const OutputSocket *> graph_inputs,
+                                                     Span<const InputSocket *> graph_outputs,
+                                                     const Logger *logger)
     : graph_(graph), graph_inputs_(graph_inputs), graph_outputs_(graph_outputs), logger_(logger)
 {
   for (const OutputSocket *socket : graph_inputs_) {
diff --git a/source/blender/nodes/NOD_geometry_nodes_to_lazy_function_graph.hh b/source/blender/nodes/NOD_geometry_nodes_to_lazy_function_graph.hh
index a8bc2cff23b..cea8159c42f 100644
--- a/source/blender/nodes/NOD_geometry_nodes_to_lazy_function_graph.hh
+++ b/source/blender/nodes/NOD_geometry_nodes_to_lazy_function_graph.hh
@@ -105,7 +105,7 @@ struct GeometryNodesLazyFunctionGraphInfo {
 };
 
 class GeometryNodesLazyFunctionLogger
-    : public fn::lazy_function::LazyFunctionGraphExecutionLogger {
+    : public fn::lazy_function::LazyFunctionGraphExecutor::Logger {
  private:
   const GeometryNodesLazyFunctionGraphInfo &lf_graph_info_;