diff options
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/modifiers/intern/MOD_nodes.cc | 3 | ||||
-rw-r--r-- | source/blender/nodes/NOD_geometry_nodes_lazy_function.hh | 5 | ||||
-rw-r--r-- | source/blender/nodes/intern/geometry_nodes_lazy_function.cc | 15 |
3 files changed, 5 insertions, 18 deletions
diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc index ffd78a90638..9e807bb2936 100644 --- a/source/blender/modifiers/intern/MOD_nodes.cc +++ b/source/blender/modifiers/intern/MOD_nodes.cc @@ -1142,8 +1142,7 @@ static GeometrySet compute_geometry( Array<bool> param_set_outputs(graph_outputs.size(), false); blender::nodes::GeometryNodesLazyFunctionLogger lf_logger(lf_graph_info); - blender::nodes::GeometryNodesLazyFunctionSideEffectProvider lf_side_effect_provider( - lf_graph_info); + blender::nodes::GeometryNodesLazyFunctionSideEffectProvider lf_side_effect_provider; lf::GraphExecutor graph_executor{ lf_graph_info.graph, graph_inputs, graph_outputs, &lf_logger, &lf_side_effect_provider}; diff --git a/source/blender/nodes/NOD_geometry_nodes_lazy_function.hh b/source/blender/nodes/NOD_geometry_nodes_lazy_function.hh index 3137dc41857..929f20af1c8 100644 --- a/source/blender/nodes/NOD_geometry_nodes_lazy_function.hh +++ b/source/blender/nodes/NOD_geometry_nodes_lazy_function.hh @@ -157,12 +157,7 @@ class GeometryNodesLazyFunctionLogger : public fn::lazy_function::GraphExecutor: */ class GeometryNodesLazyFunctionSideEffectProvider : public fn::lazy_function::GraphExecutor::SideEffectProvider { - private: - const GeometryNodesLazyFunctionGraphInfo &lf_graph_info_; - public: - GeometryNodesLazyFunctionSideEffectProvider( - const GeometryNodesLazyFunctionGraphInfo &lf_graph_info); Vector<const lf::FunctionNode *> get_nodes_with_side_effects( const lf::Context &context) const override; }; diff --git a/source/blender/nodes/intern/geometry_nodes_lazy_function.cc b/source/blender/nodes/intern/geometry_nodes_lazy_function.cc index e4d476e6374..b0b7449b889 100644 --- a/source/blender/nodes/intern/geometry_nodes_lazy_function.cc +++ b/source/blender/nodes/intern/geometry_nodes_lazy_function.cc @@ -416,7 +416,6 @@ class LazyFunctionForMultiFunctionConversion : public LazyFunction { */ class LazyFunctionForMultiFunctionNode : public LazyFunction { private: - const bNode &node_; const NodeMultiFunctions::Item fn_item_; Vector<const ValueOrFieldCPPType *> input_types_; Vector<const ValueOrFieldCPPType *> output_types_; @@ -427,7 +426,7 @@ class LazyFunctionForMultiFunctionNode : public LazyFunction { NodeMultiFunctions::Item fn_item, Vector<const bNodeSocket *> &r_used_inputs, Vector<const bNodeSocket *> &r_used_outputs) - : node_(node), fn_item_(std::move(fn_item)) + : fn_item_(std::move(fn_item)) { BLI_assert(fn_item_.fn != nullptr); debug_name_ = node.name; @@ -575,7 +574,7 @@ class LazyFunctionForGroupNode : public LazyFunction { } lf_logger_.emplace(lf_graph_info); - lf_side_effect_provider_.emplace(lf_graph_info); + lf_side_effect_provider_.emplace(); graph_executor_.emplace(lf_graph_info.graph, std::move(graph_inputs), std::move(graph_outputs), @@ -599,12 +598,12 @@ class LazyFunctionForGroupNode : public LazyFunction { graph_executor_->execute(params, group_context); } - void *init_storage(LinearAllocator<> &allocator) const + void *init_storage(LinearAllocator<> &allocator) const override { return graph_executor_->init_storage(allocator); } - void destruct_storage(void *storage) const + void destruct_storage(void *storage) const override { graph_executor_->destruct_storage(storage); } @@ -1300,12 +1299,6 @@ void GeometryNodesLazyFunctionLogger::dump_when_input_is_set_twice( user_data->compute_context->print_stack(std::cout, ss.str()); } -GeometryNodesLazyFunctionSideEffectProvider::GeometryNodesLazyFunctionSideEffectProvider( - const GeometryNodesLazyFunctionGraphInfo &lf_graph_info) - : lf_graph_info_(lf_graph_info) -{ -} - Vector<const lf::FunctionNode *> GeometryNodesLazyFunctionSideEffectProvider:: get_nodes_with_side_effects(const lf::Context &context) const { |