[Bf-blender-cvs] [a347508dcc2] temp-geometry-nodes-evaluator-refactor: simplify naming
Jacques Lucke
noreply at git.blender.org
Tue Sep 6 20:09:56 CEST 2022
Commit: a347508dcc237e54adc6609a18bd3bd7e785141b
Author: Jacques Lucke
Date: Tue Sep 6 19:28:13 2022 +0200
Branches: temp-geometry-nodes-evaluator-refactor
https://developer.blender.org/rBa347508dcc237e54adc6609a18bd3bd7e785141b
simplify naming
===================================================================
M source/blender/functions/FN_lazy_function_graph.hh
M source/blender/functions/FN_lazy_function_graph_executor.hh
M source/blender/functions/intern/lazy_function_graph.cc
M source/blender/functions/intern/lazy_function_graph_executor.cc
M source/blender/functions/tests/FN_lazy_function_test.cc
M source/blender/modifiers/intern/MOD_nodes.cc
M source/blender/nodes/NOD_geometry_nodes_to_lazy_function_graph.hh
M source/blender/nodes/intern/geometry_nodes_to_lazy_function_graph.cc
===================================================================
diff --git a/source/blender/functions/FN_lazy_function_graph.hh b/source/blender/functions/FN_lazy_function_graph.hh
index 753b1620752..0826bfe7c21 100644
--- a/source/blender/functions/FN_lazy_function_graph.hh
+++ b/source/blender/functions/FN_lazy_function_graph.hh
@@ -16,7 +16,7 @@ class Socket;
class InputSocket;
class OutputSocket;
class Node;
-class LazyFunctionGraph;
+class Graph;
class Socket : NonCopyable, NonMovable {
protected:
@@ -25,7 +25,7 @@ class Socket : NonCopyable, NonMovable {
bool is_input_;
int index_in_node_;
- friend LazyFunctionGraph;
+ friend Graph;
public:
bool is_input() const;
@@ -51,7 +51,7 @@ class InputSocket : public Socket {
OutputSocket *origin_;
const void *default_value_ = nullptr;
- friend LazyFunctionGraph;
+ friend Graph;
public:
OutputSocket *origin();
@@ -65,7 +65,7 @@ class OutputSocket : public Socket {
private:
Vector<InputSocket *> targets_;
- friend LazyFunctionGraph;
+ friend Graph;
public:
Span<InputSocket *> targets();
@@ -79,7 +79,7 @@ class Node : NonCopyable, NonMovable {
Span<OutputSocket *> outputs_;
int index_in_graph_ = -1;
- friend LazyFunctionGraph;
+ friend Graph;
public:
bool is_dummy() const;
@@ -111,13 +111,13 @@ class DummyNode : public Node {
friend Node;
};
-class LazyFunctionGraph : NonCopyable, NonMovable {
+class Graph : NonCopyable, NonMovable {
private:
LinearAllocator<> allocator_;
Vector<Node *> nodes_;
public:
- ~LazyFunctionGraph();
+ ~Graph();
Span<const Node *> nodes() const;
@@ -308,10 +308,10 @@ inline const LazyFunction &FunctionNode::function() const
/** \} */
/* -------------------------------------------------------------------- */
-/** \name #LazyFunctionGraph Inline Methods
+/** \name #Graph Inline Methods
* \{ */
-inline Span<const Node *> LazyFunctionGraph::nodes() const
+inline Span<const Node *> Graph::nodes() const
{
return nodes_;
}
diff --git a/source/blender/functions/FN_lazy_function_graph_executor.hh b/source/blender/functions/FN_lazy_function_graph_executor.hh
index 64f6059f7b6..cabc69f34ac 100644
--- a/source/blender/functions/FN_lazy_function_graph_executor.hh
+++ b/source/blender/functions/FN_lazy_function_graph_executor.hh
@@ -13,31 +13,31 @@
namespace blender::fn::lazy_function {
-class LazyFunctionGraphExecutionLogger {
+class GraphExecutorLogger {
public:
- virtual ~LazyFunctionGraphExecutionLogger() = default;
+ virtual ~GraphExecutorLogger() = default;
virtual void log_socket_value(const Context &context,
const Socket &socket,
GPointer value) const;
};
-class LazyFunctionGraphExecutionSideEffectProvider {
+class GraphExecutorSideEffectProvider {
public:
- virtual ~LazyFunctionGraphExecutionSideEffectProvider() = default;
+ virtual ~GraphExecutorSideEffectProvider() = default;
virtual Vector<const FunctionNode *> get_nodes_with_side_effects(const Context &context) const;
};
-class LazyFunctionGraphExecutor : public LazyFunction {
+class GraphExecutor : public LazyFunction {
public:
- using Logger = LazyFunctionGraphExecutionLogger;
- using SideEffectProvider = LazyFunctionGraphExecutionSideEffectProvider;
+ using Logger = GraphExecutorLogger;
+ using SideEffectProvider = GraphExecutorSideEffectProvider;
private:
/**
* The graph that is evaluated.
*/
- const LazyFunctionGraph &graph_;
+ const Graph &graph_;
/**
* Input and output sockets of the entire graph.
*/
@@ -56,11 +56,11 @@ class LazyFunctionGraphExecutor : public LazyFunction {
friend class Executor;
public:
- LazyFunctionGraphExecutor(const LazyFunctionGraph &graph,
- Span<const OutputSocket *> graph_inputs,
- Span<const InputSocket *> graph_outputs,
- const Logger *logger,
- const SideEffectProvider *side_effect_provider);
+ GraphExecutor(const Graph &graph,
+ Span<const OutputSocket *> graph_inputs,
+ Span<const InputSocket *> graph_outputs,
+ const Logger *logger,
+ const SideEffectProvider *side_effect_provider);
void *init_storage(LinearAllocator<> &allocator) const override;
void destruct_storage(void *storage) const override;
diff --git a/source/blender/functions/intern/lazy_function_graph.cc b/source/blender/functions/intern/lazy_function_graph.cc
index 3933a380c20..c60431d2c3d 100644
--- a/source/blender/functions/intern/lazy_function_graph.cc
+++ b/source/blender/functions/intern/lazy_function_graph.cc
@@ -6,7 +6,7 @@
namespace blender::fn::lazy_function {
-LazyFunctionGraph::~LazyFunctionGraph()
+Graph::~Graph()
{
for (Node *node : nodes_) {
for (InputSocket *socket : node->inputs_) {
@@ -19,7 +19,7 @@ LazyFunctionGraph::~LazyFunctionGraph()
}
}
-FunctionNode &LazyFunctionGraph::add_function(const LazyFunction &fn)
+FunctionNode &Graph::add_function(const LazyFunction &fn)
{
const Span<Input> inputs = fn.inputs();
const Span<Output> outputs = fn.outputs();
@@ -48,8 +48,7 @@ FunctionNode &LazyFunctionGraph::add_function(const LazyFunction &fn)
return node;
}
-DummyNode &LazyFunctionGraph::add_dummy(Span<const CPPType *> input_types,
- Span<const CPPType *> output_types)
+DummyNode &Graph::add_dummy(Span<const CPPType *> input_types, Span<const CPPType *> output_types)
{
DummyNode &node = *allocator_.construct<DummyNode>().release();
node.fn_ = nullptr;
@@ -76,7 +75,7 @@ DummyNode &LazyFunctionGraph::add_dummy(Span<const CPPType *> input_types,
return node;
}
-void LazyFunctionGraph::add_link(OutputSocket &from, InputSocket &to)
+void Graph::add_link(OutputSocket &from, InputSocket &to)
{
BLI_assert(to.origin_ == nullptr);
BLI_assert(from.type_ == to.type_);
@@ -84,7 +83,7 @@ void LazyFunctionGraph::add_link(OutputSocket &from, InputSocket &to)
from.targets_.append(&to);
}
-void LazyFunctionGraph::remove_link(OutputSocket &from, InputSocket &to)
+void Graph::remove_link(OutputSocket &from, InputSocket &to)
{
BLI_assert(to.origin_ == &from);
BLI_assert(from.targets_.contains(&to));
@@ -92,14 +91,14 @@ void LazyFunctionGraph::remove_link(OutputSocket &from, InputSocket &to)
from.targets_.remove_first_occurrence_and_reorder(&to);
}
-void LazyFunctionGraph::update_node_indices()
+void Graph::update_node_indices()
{
for (const int i : nodes_.index_range()) {
nodes_[i]->index_in_graph_ = i;
}
}
-bool LazyFunctionGraph::node_indices_are_valid() const
+bool Graph::node_indices_are_valid() const
{
for (const int i : nodes_.index_range()) {
if (nodes_[i]->index_in_graph_ != i) {
@@ -130,7 +129,7 @@ std::string Node::name() const
return fn_->name();
}
-std::string LazyFunctionGraph::to_dot() const
+std::string Graph::to_dot() const
{
dot::DirectedGraph digraph;
digraph.set_rankdir(dot::Attr_rankdir::LeftToRight);
diff --git a/source/blender/functions/intern/lazy_function_graph_executor.cc b/source/blender/functions/intern/lazy_function_graph_executor.cc
index 69de1345e61..0e17d0a682c 100644
--- a/source/blender/functions/intern/lazy_function_graph_executor.cc
+++ b/source/blender/functions/intern/lazy_function_graph_executor.cc
@@ -174,7 +174,7 @@ class GraphExecutorLFParams;
class Executor {
private:
- const LazyFunctionGraphExecutor &self_;
+ const GraphExecutor &self_;
/**
* 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.
@@ -206,8 +206,7 @@ class Executor {
friend GraphExecutorLFParams;
public:
- Executor(const LazyFunctionGraphExecutor &self)
- : self_(self), loaded_inputs_(self.graph_inputs_.size())
+ Executor(const GraphExecutor &self) : self_(self), loaded_inputs_(self.graph_inputs_.size())
{
/* The indices are necessary, because they are used as keys in #node_states_. */
BLI_assert(self_.graph_.node_indices_are_valid());
@@ -994,12 +993,11 @@ void Executor::execute_node(const FunctionNode &node,
fn.execute(node_params, fn_context);
}
-LazyFunctionGraphExecutor::LazyFunctionGraphExecutor(
- const LazyFunctionGraph &graph,
- const Span<const OutputSocket *> graph_inputs,
- const Span<const InputSocket *> graph_outputs,
- const Logger *logger,
- const SideEffectProvider *side_effect_provider)
+GraphExecutor::GraphExecutor(const Graph &graph,
+ const Span<const OutputSocket *> graph_inputs,
+ const Span<const InputSocket *> graph_outputs,
+ const Logger *logger,
+ const SideEffectProvider *side_effect_provider)
: graph_(graph),
graph_inputs_(graph_inputs),
graph_outputs_(graph_outputs),
@@ -1016,32 +1014,32 @@ LazyFunctionGraphExecutor::LazyFunctionGraphExecutor(
}
}
-void LazyFunctionGraphExecutor::execute_impl(Params ¶ms, const Context &context) const
+void GraphExecutor::execute_impl(Params ¶ms, const Context &context) const
{
Executor &executor = *static_cast<Executor *>(context.storage);
executor.execute(params, context);
}
-void *LazyFunctionGraphExecutor::init_storage(LinearAllocator<> &allocator) const
+void *GraphExecutor::init_storage(LinearAllocator<> &allocator) const
{
Executor &executor = *allocator.construct<Executor>(*this).release();
return &executor;
}
-void LazyFunctionGraphExecutor::destruct_storage(void *storage) const
+void GraphExecutor::destruct_storage(void *storage) const
{
std::destroy_at(static_cast<Executor *>(storage));
}
-void LazyFunctionGraphExecutionLogger::log_socket_value(const Context &context,
- const Socket &socket,
- GPointer value) const
+void GraphExecutorLogger::log_socket_value(const Context &context,
+ const Socket &socket,
+ GPoint
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list