diff options
Diffstat (limited to 'source/blender/functions/intern')
3 files changed, 204 insertions, 204 deletions
diff --git a/source/blender/functions/intern/attributes_ref.cc b/source/blender/functions/intern/attributes_ref.cc index dc64f571596..047fa12adb4 100644 --- a/source/blender/functions/intern/attributes_ref.cc +++ b/source/blender/functions/intern/attributes_ref.cc @@ -21,50 +21,50 @@ namespace fn { AttributesInfoBuilder::~AttributesInfoBuilder() { - for (uint i : m_defaults.index_range()) { - m_types[i]->destruct(m_defaults[i]); + for (uint i : defaults_.index_range()) { + types_[i]->destruct(defaults_[i]); } } void AttributesInfoBuilder::add(StringRef name, const CPPType &type, const void *default_value) { - if (m_names.add_as(name)) { - m_types.append(&type); + if (names_.add_as(name)) { + types_.append(&type); if (default_value == nullptr) { default_value = type.default_value(); } - void *dst = m_allocator.allocate(type.size(), type.alignment()); + void *dst = allocator_.allocate(type.size(), type.alignment()); type.copy_to_uninitialized(default_value, dst); - m_defaults.append(dst); + defaults_.append(dst); } else { /* The same name can be added more than once as long as the type is always the same. */ - BLI_assert(m_types[m_names.index_of_as(name)] == &type); + BLI_assert(types_[names_.index_of_as(name)] == &type); } } AttributesInfo::AttributesInfo(const AttributesInfoBuilder &builder) { - for (uint i : builder.m_types.index_range()) { - StringRefNull name = m_allocator.copy_string(builder.m_names[i]); - const CPPType &type = *builder.m_types[i]; - const void *default_value = builder.m_defaults[i]; + for (uint i : builder.types_.index_range()) { + StringRefNull name = allocator_.copy_string(builder.names_[i]); + const CPPType &type = *builder.types_[i]; + const void *default_value = builder.defaults_[i]; - m_index_by_name.add_new(name, i); - m_name_by_index.append(name); - m_type_by_index.append(&type); + index_by_name_.add_new(name, i); + name_by_index_.append(name); + type_by_index_.append(&type); - void *dst = m_allocator.allocate(type.size(), type.alignment()); + void *dst = allocator_.allocate(type.size(), type.alignment()); type.copy_to_uninitialized(default_value, dst); - m_defaults.append(dst); + defaults_.append(dst); } } AttributesInfo::~AttributesInfo() { - for (uint i : m_defaults.index_range()) { - m_type_by_index[i]->destruct(m_defaults[i]); + for (uint i : defaults_.index_range()) { + type_by_index_[i]->destruct(defaults_[i]); } } diff --git a/source/blender/functions/intern/multi_function_network.cc b/source/blender/functions/intern/multi_function_network.cc index 93d062f3e5c..f2a28776660 100644 --- a/source/blender/functions/intern/multi_function_network.cc +++ b/source/blender/functions/intern/multi_function_network.cc @@ -22,11 +22,11 @@ namespace fn { MFNetwork::~MFNetwork() { - for (MFFunctionNode *node : m_function_nodes) { + for (MFFunctionNode *node : function_nodes_) { node->destruct_sockets(); node->~MFFunctionNode(); } - for (MFDummyNode *node : m_dummy_nodes) { + for (MFDummyNode *node : dummy_nodes_) { node->destruct_sockets(); node->~MFDummyNode(); } @@ -34,10 +34,10 @@ MFNetwork::~MFNetwork() void MFNode::destruct_sockets() { - for (MFInputSocket *socket : m_inputs) { + for (MFInputSocket *socket : inputs_) { socket->~MFInputSocket(); } - for (MFOutputSocket *socket : m_outputs) { + for (MFOutputSocket *socket : outputs_) { socket->~MFOutputSocket(); } } @@ -69,19 +69,19 @@ MFFunctionNode &MFNetwork::add_function(const MultiFunction &function) } } - MFFunctionNode &node = *m_allocator.construct<MFFunctionNode>(); - m_function_nodes.add_new(&node); + MFFunctionNode &node = *allocator_.construct<MFFunctionNode>(); + function_nodes_.add_new(&node); - node.m_network = this; - node.m_is_dummy = false; - node.m_id = m_node_or_null_by_id.append_and_get_index(&node); - node.m_function = &function; - node.m_input_param_indices = m_allocator.construct_array_copy<uint>(input_param_indices); - node.m_output_param_indices = m_allocator.construct_array_copy<uint>(output_param_indices); + node.network_ = this; + node.is_dummy_ = false; + node.id_ = node_or_null_by_id_.append_and_get_index(&node); + node.function_ = &function; + node.input_param_indices_ = allocator_.construct_array_copy<uint>(input_param_indices); + node.output_param_indices_ = allocator_.construct_array_copy<uint>(output_param_indices); - node.m_inputs = m_allocator.construct_elements_and_pointer_array<MFInputSocket>( + node.inputs_ = allocator_.construct_elements_and_pointer_array<MFInputSocket>( input_param_indices.size()); - node.m_outputs = m_allocator.construct_elements_and_pointer_array<MFOutputSocket>( + node.outputs_ = allocator_.construct_elements_and_pointer_array<MFOutputSocket>( output_param_indices.size()); for (uint i : input_param_indices.index_range()) { @@ -89,14 +89,14 @@ MFFunctionNode &MFNetwork::add_function(const MultiFunction &function) MFParamType param = function.param_type(param_index); BLI_assert(param.is_input_or_mutable()); - MFInputSocket &socket = *node.m_inputs[i]; - socket.m_data_type = param.data_type(); - socket.m_node = &node; - socket.m_index = i; - socket.m_is_output = false; - socket.m_name = function.param_name(param_index); - socket.m_origin = nullptr; - socket.m_id = m_socket_or_null_by_id.append_and_get_index(&socket); + MFInputSocket &socket = *node.inputs_[i]; + socket.data_type_ = param.data_type(); + socket.node_ = &node; + socket.index_ = i; + socket.is_output_ = false; + socket.name_ = function.param_name(param_index); + socket.origin_ = nullptr; + socket.id_ = socket_or_null_by_id_.append_and_get_index(&socket); } for (uint i : output_param_indices.index_range()) { @@ -104,13 +104,13 @@ MFFunctionNode &MFNetwork::add_function(const MultiFunction &function) MFParamType param = function.param_type(param_index); BLI_assert(param.is_output_or_mutable()); - MFOutputSocket &socket = *node.m_outputs[i]; - socket.m_data_type = param.data_type(); - socket.m_node = &node; - socket.m_index = i; - socket.m_is_output = true; - socket.m_name = function.param_name(param_index); - socket.m_id = m_socket_or_null_by_id.append_and_get_index(&socket); + MFOutputSocket &socket = *node.outputs_[i]; + socket.data_type_ = param.data_type(); + socket.node_ = &node; + socket.index_ = i; + socket.is_output_ = true; + socket.name_ = function.param_name(param_index); + socket.id_ = socket_or_null_by_id_.append_and_get_index(&socket); } return node; @@ -128,42 +128,42 @@ MFDummyNode &MFNetwork::add_dummy(StringRef name, assert_same_size(input_types, input_names); assert_same_size(output_types, output_names); - MFDummyNode &node = *m_allocator.construct<MFDummyNode>(); - m_dummy_nodes.add_new(&node); + MFDummyNode &node = *allocator_.construct<MFDummyNode>(); + dummy_nodes_.add_new(&node); - node.m_network = this; - node.m_is_dummy = true; - node.m_name = m_allocator.copy_string(name); - node.m_id = m_node_or_null_by_id.append_and_get_index(&node); + node.network_ = this; + node.is_dummy_ = true; + node.name_ = allocator_.copy_string(name); + node.id_ = node_or_null_by_id_.append_and_get_index(&node); - node.m_inputs = m_allocator.construct_elements_and_pointer_array<MFInputSocket>( + node.inputs_ = allocator_.construct_elements_and_pointer_array<MFInputSocket>( input_types.size()); - node.m_outputs = m_allocator.construct_elements_and_pointer_array<MFOutputSocket>( + node.outputs_ = allocator_.construct_elements_and_pointer_array<MFOutputSocket>( output_types.size()); - node.m_input_names = m_allocator.allocate_array<StringRefNull>(input_types.size()); - node.m_output_names = m_allocator.allocate_array<StringRefNull>(output_types.size()); + node.input_names_ = allocator_.allocate_array<StringRefNull>(input_types.size()); + node.output_names_ = allocator_.allocate_array<StringRefNull>(output_types.size()); for (uint i : input_types.index_range()) { - MFInputSocket &socket = *node.m_inputs[i]; - socket.m_data_type = input_types[i]; - socket.m_node = &node; - socket.m_index = i; - socket.m_is_output = false; - socket.m_name = m_allocator.copy_string(input_names[i]); - socket.m_id = m_socket_or_null_by_id.append_and_get_index(&socket); - node.m_input_names[i] = socket.m_name; + MFInputSocket &socket = *node.inputs_[i]; + socket.data_type_ = input_types[i]; + socket.node_ = &node; + socket.index_ = i; + socket.is_output_ = false; + socket.name_ = allocator_.copy_string(input_names[i]); + socket.id_ = socket_or_null_by_id_.append_and_get_index(&socket); + node.input_names_[i] = socket.name_; } for (uint i : output_types.index_range()) { - MFOutputSocket &socket = *node.m_outputs[i]; - socket.m_data_type = output_types[i]; - socket.m_node = &node; - socket.m_index = i; - socket.m_is_output = true; - socket.m_name = m_allocator.copy_string(output_names[i]); - socket.m_id = m_socket_or_null_by_id.append_and_get_index(&socket); - node.m_output_names[i] = socket.m_name; + MFOutputSocket &socket = *node.outputs_[i]; + socket.data_type_ = output_types[i]; + socket.node_ = &node; + socket.index_ = i; + socket.is_output_ = true; + socket.name_ = allocator_.copy_string(output_names[i]); + socket.id_ = socket_or_null_by_id_.append_and_get_index(&socket); + node.output_names_[i] = socket.name_; } return node; @@ -176,11 +176,11 @@ MFDummyNode &MFNetwork::add_dummy(StringRef name, */ void MFNetwork::add_link(MFOutputSocket &from, MFInputSocket &to) { - BLI_assert(to.m_origin == nullptr); - BLI_assert(from.m_node->m_network == to.m_node->m_network); - BLI_assert(from.m_data_type == to.m_data_type); - from.m_targets.append(&to); - to.m_origin = &from; + BLI_assert(to.origin_ == nullptr); + BLI_assert(from.node_->network_ == to.node_->network_); + BLI_assert(from.data_type_ == to.data_type_); + from.targets_.append(&to); + to.origin_ = &from; } MFOutputSocket &MFNetwork::add_input(StringRef name, MFDataType data_type) @@ -197,38 +197,38 @@ void MFNetwork::relink(MFOutputSocket &old_output, MFOutputSocket &new_output) { BLI_assert(&old_output != &new_output); for (MFInputSocket *input : old_output.targets()) { - input->m_origin = &new_output; + input->origin_ = &new_output; } - new_output.m_targets.extend(old_output.m_targets); - old_output.m_targets.clear(); + new_output.targets_.extend(old_output.targets_); + old_output.targets_.clear(); } void MFNetwork::remove(MFNode &node) { - for (MFInputSocket *socket : node.m_inputs) { - if (socket->m_origin != nullptr) { - socket->m_origin->m_targets.remove_first_occurrence_and_reorder(socket); + for (MFInputSocket *socket : node.inputs_) { + if (socket->origin_ != nullptr) { + socket->origin_->targets_.remove_first_occurrence_and_reorder(socket); } - m_socket_or_null_by_id[socket->m_id] = nullptr; + socket_or_null_by_id_[socket->id_] = nullptr; } - for (MFOutputSocket *socket : node.m_outputs) { - for (MFInputSocket *other : socket->m_targets) { - other->m_origin = nullptr; + for (MFOutputSocket *socket : node.outputs_) { + for (MFInputSocket *other : socket->targets_) { + other->origin_ = nullptr; } - m_socket_or_null_by_id[socket->m_id] = nullptr; + socket_or_null_by_id_[socket->id_] = nullptr; } node.destruct_sockets(); if (node.is_dummy()) { MFDummyNode &dummy_node = node.as_dummy(); dummy_node.~MFDummyNode(); - m_dummy_nodes.remove_contained(&dummy_node); + dummy_nodes_.remove_contained(&dummy_node); } else { MFFunctionNode &function_node = node.as_function(); function_node.~MFFunctionNode(); - m_function_nodes.remove_contained(&function_node); + function_nodes_.remove_contained(&function_node); } - m_node_or_null_by_id[node.m_id] = nullptr; + node_or_null_by_id_[node.id_] = nullptr; } std::string MFNetwork::to_dot() const @@ -239,17 +239,17 @@ std::string MFNetwork::to_dot() const Map<const MFNode *, dot::NodeWithSocketsRef> dot_nodes; Vector<const MFNode *> all_nodes; - all_nodes.extend(m_function_nodes.as_span()); - all_nodes.extend(m_dummy_nodes.as_span()); + all_nodes.extend(function_nodes_.as_span()); + all_nodes.extend(dummy_nodes_.as_span()); for (const MFNode *node : all_nodes) { dot::Node &dot_node = digraph.new_node(""); Vector<std::string> input_names, output_names; - for (const MFInputSocket *socket : node->m_inputs) { + for (const MFInputSocket *socket : node->inputs_) { input_names.append(socket->name() + "(" + socket->data_type().to_string() + ")"); } - for (const MFOutputSocket *socket : node->m_outputs) { + for (const MFOutputSocket *socket : node->outputs_) { output_names.append(socket->name() + " (" + socket->data_type().to_string() + ")"); } @@ -260,13 +260,13 @@ std::string MFNetwork::to_dot() const for (const MFNode *to_node : all_nodes) { dot::NodeWithSocketsRef to_dot_node = dot_nodes.lookup(to_node); - for (const MFInputSocket *to_socket : to_node->m_inputs) { - const MFOutputSocket *from_socket = to_socket->m_origin; + for (const MFInputSocket *to_socket : to_node->inputs_) { + const MFOutputSocket *from_socket = to_socket->origin_; if (from_socket != nullptr) { - const MFNode *from_node = from_socket->m_node; + const MFNode *from_node = from_socket->node_; dot::NodeWithSocketsRef from_dot_node = dot_nodes.lookup(from_node); - digraph.new_edge(from_dot_node.output(from_socket->m_index), - to_dot_node.input(to_socket->m_index)); + digraph.new_edge(from_dot_node.output(from_socket->index_), + to_dot_node.input(to_socket->index_)); } } } diff --git a/source/blender/functions/intern/multi_function_network_evaluation.cc b/source/blender/functions/intern/multi_function_network_evaluation.cc index 327a3a66561..187af4c8aa6 100644 --- a/source/blender/functions/intern/multi_function_network_evaluation.cc +++ b/source/blender/functions/intern/multi_function_network_evaluation.cc @@ -53,10 +53,10 @@ struct Value; */ class MFNetworkEvaluationStorage { private: - LinearAllocator<> m_allocator; - IndexMask m_mask; - Array<Value *> m_value_per_output_id; - uint m_min_array_size; + LinearAllocator<> allocator_; + IndexMask mask_; + Array<Value *> value_per_output_id_; + uint min_array_size_; public: MFNetworkEvaluationStorage(IndexMask mask, uint max_socket_id); @@ -102,12 +102,12 @@ class MFNetworkEvaluationStorage { MFNetworkEvaluator::MFNetworkEvaluator(Vector<const MFOutputSocket *> inputs, Vector<const MFInputSocket *> outputs) - : m_inputs(std::move(inputs)), m_outputs(std::move(outputs)) + : inputs_(std::move(inputs)), outputs_(std::move(outputs)) { - BLI_assert(m_outputs.size() > 0); + BLI_assert(outputs_.size() > 0); MFSignatureBuilder signature = this->get_builder("Function Tree"); - for (auto socket : m_inputs) { + for (auto socket : inputs_) { BLI_assert(socket->node().is_dummy()); MFDataType type = socket->data_type(); @@ -121,7 +121,7 @@ MFNetworkEvaluator::MFNetworkEvaluator(Vector<const MFOutputSocket *> inputs, } } - for (auto socket : m_outputs) { + for (auto socket : outputs_) { BLI_assert(socket->node().is_dummy()); MFDataType type = socket->data_type(); @@ -142,7 +142,7 @@ void MFNetworkEvaluator::call(IndexMask mask, MFParams params, MFContext context return; } - const MFNetwork &network = m_outputs[0]->node().network(); + const MFNetwork &network = outputs_[0]->node().network(); Storage storage(mask, network.max_socket_id()); Vector<const MFInputSocket *> outputs_to_initialize_in_the_end; @@ -156,9 +156,9 @@ void MFNetworkEvaluator::call(IndexMask mask, MFParams params, MFContext context BLI_NOINLINE void MFNetworkEvaluator::copy_inputs_to_storage(MFParams params, Storage &storage) const { - for (uint input_index : m_inputs.index_range()) { + for (uint input_index : inputs_.index_range()) { uint param_index = input_index + 0; - const MFOutputSocket &socket = *m_inputs[input_index]; + const MFOutputSocket &socket = *inputs_[input_index]; switch (socket.data_type().category()) { case MFDataType::Single: { GVSpan input_list = params.readonly_single_input(param_index); @@ -179,13 +179,13 @@ BLI_NOINLINE void MFNetworkEvaluator::copy_outputs_to_storage( Storage &storage, Vector<const MFInputSocket *> &outputs_to_initialize_in_the_end) const { - for (uint output_index : m_outputs.index_range()) { - uint param_index = output_index + m_inputs.size(); - const MFInputSocket &socket = *m_outputs[output_index]; + for (uint output_index : outputs_.index_range()) { + uint param_index = output_index + inputs_.size(); + const MFInputSocket &socket = *outputs_[output_index]; const MFOutputSocket &origin = *socket.origin(); if (origin.node().is_dummy()) { - BLI_assert(m_inputs.contains(&origin)); + BLI_assert(inputs_.contains(&origin)); /* Don't overwrite input buffers. */ outputs_to_initialize_in_the_end.append(&socket); continue; @@ -216,7 +216,7 @@ BLI_NOINLINE void MFNetworkEvaluator::evaluate_network_to_compute_outputs( MFContext &global_context, Storage &storage) const { Stack<const MFOutputSocket *, 32> sockets_to_compute; - for (const MFInputSocket *socket : m_outputs) { + for (const MFInputSocket *socket : outputs_) { sockets_to_compute.push(socket->origin()); } @@ -386,7 +386,7 @@ BLI_NOINLINE void MFNetworkEvaluator::initialize_remaining_outputs( MFParams params, Storage &storage, Span<const MFInputSocket *> remaining_outputs) const { for (const MFInputSocket *socket : remaining_outputs) { - uint param_index = m_inputs.size() + m_outputs.first_index_of(socket); + uint param_index = inputs_.size() + outputs_.first_index_of(socket); switch (socket->data_type().category()) { case MFDataType::Single: { @@ -509,15 +509,15 @@ struct OwnVectorValue : public Value { * \{ */ MFNetworkEvaluationStorage::MFNetworkEvaluationStorage(IndexMask mask, uint max_socket_id) - : m_mask(mask), - m_value_per_output_id(max_socket_id + 1, nullptr), - m_min_array_size(mask.min_array_size()) + : mask_(mask), + value_per_output_id_(max_socket_id + 1, nullptr), + min_array_size_(mask.min_array_size()) { } MFNetworkEvaluationStorage::~MFNetworkEvaluationStorage() { - for (Value *any_value : m_value_per_output_id) { + for (Value *any_value : value_per_output_id_) { if (any_value == nullptr) { continue; } @@ -529,7 +529,7 @@ MFNetworkEvaluationStorage::~MFNetworkEvaluationStorage() type.destruct(span.buffer()); } else { - type.destruct_indices(span.buffer(), m_mask); + type.destruct_indices(span.buffer(), mask_); MEM_freeN(span.buffer()); } } @@ -542,12 +542,12 @@ MFNetworkEvaluationStorage::~MFNetworkEvaluationStorage() IndexMask MFNetworkEvaluationStorage::mask() const { - return m_mask; + return mask_; } bool MFNetworkEvaluationStorage::socket_is_computed(const MFOutputSocket &socket) { - Value *any_value = m_value_per_output_id[socket.id()]; + Value *any_value = value_per_output_id_[socket.id()]; if (any_value == nullptr) { return false; } @@ -559,7 +559,7 @@ bool MFNetworkEvaluationStorage::socket_is_computed(const MFOutputSocket &socket bool MFNetworkEvaluationStorage::is_same_value_for_every_index(const MFOutputSocket &socket) { - Value *any_value = m_value_per_output_id[socket.id()]; + Value *any_value = value_per_output_id_[socket.id()]; switch (any_value->type) { case ValueType::OwnSingle: return ((OwnSingleValue *)any_value)->span.size() == 1; @@ -580,7 +580,7 @@ bool MFNetworkEvaluationStorage::is_same_value_for_every_index(const MFOutputSoc bool MFNetworkEvaluationStorage::socket_has_buffer_for_output(const MFOutputSocket &socket) { - Value *any_value = m_value_per_output_id[socket.id()]; + Value *any_value = value_per_output_id_[socket.id()]; if (any_value == nullptr) { return false; } @@ -601,7 +601,7 @@ void MFNetworkEvaluationStorage::finish_node(const MFFunctionNode &node) void MFNetworkEvaluationStorage::finish_output_socket(const MFOutputSocket &socket) { - Value *any_value = m_value_per_output_id[socket.id()]; + Value *any_value = value_per_output_id_[socket.id()]; if (any_value == nullptr) { return; } @@ -615,7 +615,7 @@ void MFNetworkEvaluationStorage::finish_input_socket(const MFInputSocket &socket { const MFOutputSocket &origin = *socket.origin(); - Value *any_value = m_value_per_output_id[origin.id()]; + Value *any_value = value_per_output_id_[origin.id()]; if (any_value == nullptr) { /* Can happen when a value has been forward to the next node. */ return; @@ -639,10 +639,10 @@ void MFNetworkEvaluationStorage::finish_input_socket(const MFInputSocket &socket type.destruct(span.buffer()); } else { - type.destruct_indices(span.buffer(), m_mask); + type.destruct_indices(span.buffer(), mask_); MEM_freeN(span.buffer()); } - m_value_per_output_id[origin.id()] = nullptr; + value_per_output_id_[origin.id()] = nullptr; } break; } @@ -652,7 +652,7 @@ void MFNetworkEvaluationStorage::finish_input_socket(const MFInputSocket &socket value->max_remaining_users--; if (value->max_remaining_users == 0) { delete value->vector_array; - m_value_per_output_id[origin.id()] = nullptr; + value_per_output_id_[origin.id()] = nullptr; } break; } @@ -662,53 +662,53 @@ void MFNetworkEvaluationStorage::finish_input_socket(const MFInputSocket &socket void MFNetworkEvaluationStorage::add_single_input_from_caller(const MFOutputSocket &socket, GVSpan virtual_span) { - BLI_assert(m_value_per_output_id[socket.id()] == nullptr); - BLI_assert(virtual_span.size() >= m_min_array_size); + BLI_assert(value_per_output_id_[socket.id()] == nullptr); + BLI_assert(virtual_span.size() >= min_array_size_); - auto *value = m_allocator.construct<InputSingleValue>(virtual_span); - m_value_per_output_id[socket.id()] = value; + auto *value = allocator_.construct<InputSingleValue>(virtual_span); + value_per_output_id_[socket.id()] = value; } void MFNetworkEvaluationStorage::add_vector_input_from_caller(const MFOutputSocket &socket, GVArraySpan virtual_array_span) { - BLI_assert(m_value_per_output_id[socket.id()] == nullptr); - BLI_assert(virtual_array_span.size() >= m_min_array_size); + BLI_assert(value_per_output_id_[socket.id()] == nullptr); + BLI_assert(virtual_array_span.size() >= min_array_size_); - auto *value = m_allocator.construct<InputVectorValue>(virtual_array_span); - m_value_per_output_id[socket.id()] = value; + auto *value = allocator_.construct<InputVectorValue>(virtual_array_span); + value_per_output_id_[socket.id()] = value; } void MFNetworkEvaluationStorage::add_single_output_from_caller(const MFOutputSocket &socket, GMutableSpan span) { - BLI_assert(m_value_per_output_id[socket.id()] == nullptr); - BLI_assert(span.size() >= m_min_array_size); + BLI_assert(value_per_output_id_[socket.id()] == nullptr); + BLI_assert(span.size() >= min_array_size_); - auto *value = m_allocator.construct<OutputSingleValue>(span); - m_value_per_output_id[socket.id()] = value; + auto *value = allocator_.construct<OutputSingleValue>(span); + value_per_output_id_[socket.id()] = value; } void MFNetworkEvaluationStorage::add_vector_output_from_caller(const MFOutputSocket &socket, GVectorArray &vector_array) { - BLI_assert(m_value_per_output_id[socket.id()] == nullptr); - BLI_assert(vector_array.size() >= m_min_array_size); + BLI_assert(value_per_output_id_[socket.id()] == nullptr); + BLI_assert(vector_array.size() >= min_array_size_); - auto *value = m_allocator.construct<OutputVectorValue>(vector_array); - m_value_per_output_id[socket.id()] = value; + auto *value = allocator_.construct<OutputVectorValue>(vector_array); + value_per_output_id_[socket.id()] = value; } GMutableSpan MFNetworkEvaluationStorage::get_single_output__full(const MFOutputSocket &socket) { - Value *any_value = m_value_per_output_id[socket.id()]; + Value *any_value = value_per_output_id_[socket.id()]; if (any_value == nullptr) { const CPPType &type = socket.data_type().single_type(); - void *buffer = MEM_mallocN_aligned(m_min_array_size * type.size(), type.alignment(), AT); - GMutableSpan span(type, buffer, m_min_array_size); + void *buffer = MEM_mallocN_aligned(min_array_size_ * type.size(), type.alignment(), AT); + GMutableSpan span(type, buffer, min_array_size_); - auto *value = m_allocator.construct<OwnSingleValue>(span, socket.targets().size(), false); - m_value_per_output_id[socket.id()] = value; + auto *value = allocator_.construct<OwnSingleValue>(span, socket.targets().size(), false); + value_per_output_id_[socket.id()] = value; return span; } @@ -720,14 +720,14 @@ GMutableSpan MFNetworkEvaluationStorage::get_single_output__full(const MFOutputS GMutableSpan MFNetworkEvaluationStorage::get_single_output__single(const MFOutputSocket &socket) { - Value *any_value = m_value_per_output_id[socket.id()]; + Value *any_value = value_per_output_id_[socket.id()]; if (any_value == nullptr) { const CPPType &type = socket.data_type().single_type(); - void *buffer = m_allocator.allocate(type.size(), type.alignment()); + void *buffer = allocator_.allocate(type.size(), type.alignment()); GMutableSpan span(type, buffer, 1); - auto *value = m_allocator.construct<OwnSingleValue>(span, socket.targets().size(), true); - m_value_per_output_id[socket.id()] = value; + auto *value = allocator_.construct<OwnSingleValue>(span, socket.targets().size(), true); + value_per_output_id_[socket.id()] = value; return value->span; } @@ -741,13 +741,13 @@ GMutableSpan MFNetworkEvaluationStorage::get_single_output__single(const MFOutpu GVectorArray &MFNetworkEvaluationStorage::get_vector_output__full(const MFOutputSocket &socket) { - Value *any_value = m_value_per_output_id[socket.id()]; + Value *any_value = value_per_output_id_[socket.id()]; if (any_value == nullptr) { const CPPType &type = socket.data_type().vector_base_type(); - GVectorArray *vector_array = new GVectorArray(type, m_min_array_size); + GVectorArray *vector_array = new GVectorArray(type, min_array_size_); - auto *value = m_allocator.construct<OwnVectorValue>(*vector_array, socket.targets().size()); - m_value_per_output_id[socket.id()] = value; + auto *value = allocator_.construct<OwnVectorValue>(*vector_array, socket.targets().size()); + value_per_output_id_[socket.id()] = value; return *value->vector_array; } @@ -759,13 +759,13 @@ GVectorArray &MFNetworkEvaluationStorage::get_vector_output__full(const MFOutput GVectorArray &MFNetworkEvaluationStorage::get_vector_output__single(const MFOutputSocket &socket) { - Value *any_value = m_value_per_output_id[socket.id()]; + Value *any_value = value_per_output_id_[socket.id()]; if (any_value == nullptr) { const CPPType &type = socket.data_type().vector_base_type(); GVectorArray *vector_array = new GVectorArray(type, 1); - auto *value = m_allocator.construct<OwnVectorValue>(*vector_array, socket.targets().size()); - m_value_per_output_id[socket.id()] = value; + auto *value = allocator_.construct<OwnVectorValue>(*vector_array, socket.targets().size()); + value_per_output_id_[socket.id()] = value; return *value->vector_array; } @@ -784,8 +784,8 @@ GMutableSpan MFNetworkEvaluationStorage::get_mutable_single__full(const MFInputS const MFOutputSocket &to = output; const CPPType &type = from.data_type().single_type(); - Value *from_any_value = m_value_per_output_id[from.id()]; - Value *to_any_value = m_value_per_output_id[to.id()]; + Value *from_any_value = value_per_output_id_[from.id()]; + Value *to_any_value = value_per_output_id_[to.id()]; BLI_assert(from_any_value != nullptr); BLI_assert(type == to.data_type().single_type()); @@ -793,28 +793,28 @@ GMutableSpan MFNetworkEvaluationStorage::get_mutable_single__full(const MFInputS BLI_assert(to_any_value->type == ValueType::OutputSingle); GMutableSpan span = ((OutputSingleValue *)to_any_value)->span; GVSpan virtual_span = this->get_single_input__full(input); - virtual_span.materialize_to_uninitialized(m_mask, span.buffer()); + virtual_span.materialize_to_uninitialized(mask_, span.buffer()); return span; } if (from_any_value->type == ValueType::OwnSingle) { OwnSingleValue *value = (OwnSingleValue *)from_any_value; if (value->max_remaining_users == 1 && !value->is_single_allocated) { - m_value_per_output_id[to.id()] = value; - m_value_per_output_id[from.id()] = nullptr; + value_per_output_id_[to.id()] = value; + value_per_output_id_[from.id()] = nullptr; value->max_remaining_users = to.targets().size(); return value->span; } } GVSpan virtual_span = this->get_single_input__full(input); - void *new_buffer = MEM_mallocN_aligned(m_min_array_size * type.size(), type.alignment(), AT); - GMutableSpan new_array_ref(type, new_buffer, m_min_array_size); - virtual_span.materialize_to_uninitialized(m_mask, new_array_ref.buffer()); + void *new_buffer = MEM_mallocN_aligned(min_array_size_ * type.size(), type.alignment(), AT); + GMutableSpan new_array_ref(type, new_buffer, min_array_size_); + virtual_span.materialize_to_uninitialized(mask_, new_array_ref.buffer()); - OwnSingleValue *new_value = m_allocator.construct<OwnSingleValue>( + OwnSingleValue *new_value = allocator_.construct<OwnSingleValue>( new_array_ref, to.targets().size(), false); - m_value_per_output_id[to.id()] = new_value; + value_per_output_id_[to.id()] = new_value; return new_array_ref; } @@ -825,8 +825,8 @@ GMutableSpan MFNetworkEvaluationStorage::get_mutable_single__single(const MFInpu const MFOutputSocket &to = output; const CPPType &type = from.data_type().single_type(); - Value *from_any_value = m_value_per_output_id[from.id()]; - Value *to_any_value = m_value_per_output_id[to.id()]; + Value *from_any_value = value_per_output_id_[from.id()]; + Value *to_any_value = value_per_output_id_[to.id()]; BLI_assert(from_any_value != nullptr); BLI_assert(type == to.data_type().single_type()); @@ -842,8 +842,8 @@ GMutableSpan MFNetworkEvaluationStorage::get_mutable_single__single(const MFInpu if (from_any_value->type == ValueType::OwnSingle) { OwnSingleValue *value = (OwnSingleValue *)from_any_value; if (value->max_remaining_users == 1) { - m_value_per_output_id[to.id()] = value; - m_value_per_output_id[from.id()] = nullptr; + value_per_output_id_[to.id()] = value; + value_per_output_id_[from.id()] = nullptr; value->max_remaining_users = to.targets().size(); BLI_assert(value->span.size() == 1); return value->span; @@ -852,13 +852,13 @@ GMutableSpan MFNetworkEvaluationStorage::get_mutable_single__single(const MFInpu GVSpan virtual_span = this->get_single_input__single(input); - void *new_buffer = m_allocator.allocate(type.size(), type.alignment()); + void *new_buffer = allocator_.allocate(type.size(), type.alignment()); type.copy_to_uninitialized(virtual_span.as_single_element(), new_buffer); GMutableSpan new_array_ref(type, new_buffer, 1); - OwnSingleValue *new_value = m_allocator.construct<OwnSingleValue>( + OwnSingleValue *new_value = allocator_.construct<OwnSingleValue>( new_array_ref, to.targets().size(), true); - m_value_per_output_id[to.id()] = new_value; + value_per_output_id_[to.id()] = new_value; return new_array_ref; } @@ -869,8 +869,8 @@ GVectorArray &MFNetworkEvaluationStorage::get_mutable_vector__full(const MFInput const MFOutputSocket &to = output; const CPPType &base_type = from.data_type().vector_base_type(); - Value *from_any_value = m_value_per_output_id[from.id()]; - Value *to_any_value = m_value_per_output_id[to.id()]; + Value *from_any_value = value_per_output_id_[from.id()]; + Value *to_any_value = value_per_output_id_[to.id()]; BLI_assert(from_any_value != nullptr); BLI_assert(base_type == to.data_type().vector_base_type()); @@ -878,15 +878,15 @@ GVectorArray &MFNetworkEvaluationStorage::get_mutable_vector__full(const MFInput BLI_assert(to_any_value->type == ValueType::OutputVector); GVectorArray &vector_array = *((OutputVectorValue *)to_any_value)->vector_array; GVArraySpan virtual_array_span = this->get_vector_input__full(input); - vector_array.extend(m_mask, virtual_array_span); + vector_array.extend(mask_, virtual_array_span); return vector_array; } if (from_any_value->type == ValueType::OwnVector) { OwnVectorValue *value = (OwnVectorValue *)from_any_value; if (value->max_remaining_users == 1) { - m_value_per_output_id[to.id()] = value; - m_value_per_output_id[from.id()] = nullptr; + value_per_output_id_[to.id()] = value; + value_per_output_id_[from.id()] = nullptr; value->max_remaining_users = to.targets().size(); return *value->vector_array; } @@ -894,12 +894,12 @@ GVectorArray &MFNetworkEvaluationStorage::get_mutable_vector__full(const MFInput GVArraySpan virtual_array_span = this->get_vector_input__full(input); - GVectorArray *new_vector_array = new GVectorArray(base_type, m_min_array_size); - new_vector_array->extend(m_mask, virtual_array_span); + GVectorArray *new_vector_array = new GVectorArray(base_type, min_array_size_); + new_vector_array->extend(mask_, virtual_array_span); - OwnVectorValue *new_value = m_allocator.construct<OwnVectorValue>(*new_vector_array, - to.targets().size()); - m_value_per_output_id[to.id()] = new_value; + OwnVectorValue *new_value = allocator_.construct<OwnVectorValue>(*new_vector_array, + to.targets().size()); + value_per_output_id_[to.id()] = new_value; return *new_vector_array; } @@ -911,8 +911,8 @@ GVectorArray &MFNetworkEvaluationStorage::get_mutable_vector__single(const MFInp const MFOutputSocket &to = output; const CPPType &base_type = from.data_type().vector_base_type(); - Value *from_any_value = m_value_per_output_id[from.id()]; - Value *to_any_value = m_value_per_output_id[to.id()]; + Value *from_any_value = value_per_output_id_[from.id()]; + Value *to_any_value = value_per_output_id_[to.id()]; BLI_assert(from_any_value != nullptr); BLI_assert(base_type == to.data_type().vector_base_type()); @@ -928,8 +928,8 @@ GVectorArray &MFNetworkEvaluationStorage::get_mutable_vector__single(const MFInp if (from_any_value->type == ValueType::OwnVector) { OwnVectorValue *value = (OwnVectorValue *)from_any_value; if (value->max_remaining_users == 1) { - m_value_per_output_id[to.id()] = value; - m_value_per_output_id[from.id()] = nullptr; + value_per_output_id_[to.id()] = value; + value_per_output_id_[from.id()] = nullptr; value->max_remaining_users = to.targets().size(); return *value->vector_array; } @@ -940,22 +940,22 @@ GVectorArray &MFNetworkEvaluationStorage::get_mutable_vector__single(const MFInp GVectorArray *new_vector_array = new GVectorArray(base_type, 1); new_vector_array->extend(0, virtual_array_span[0]); - OwnVectorValue *new_value = m_allocator.construct<OwnVectorValue>(*new_vector_array, - to.targets().size()); - m_value_per_output_id[to.id()] = new_value; + OwnVectorValue *new_value = allocator_.construct<OwnVectorValue>(*new_vector_array, + to.targets().size()); + value_per_output_id_[to.id()] = new_value; return *new_vector_array; } GVSpan MFNetworkEvaluationStorage::get_single_input__full(const MFInputSocket &socket) { const MFOutputSocket &origin = *socket.origin(); - Value *any_value = m_value_per_output_id[origin.id()]; + Value *any_value = value_per_output_id_[origin.id()]; BLI_assert(any_value != nullptr); if (any_value->type == ValueType::OwnSingle) { OwnSingleValue *value = (OwnSingleValue *)any_value; if (value->is_single_allocated) { - return GVSpan::FromSingle(value->span.type(), value->span.buffer(), m_min_array_size); + return GVSpan::FromSingle(value->span.type(), value->span.buffer(), min_array_size_); } else { return value->span; @@ -978,7 +978,7 @@ GVSpan MFNetworkEvaluationStorage::get_single_input__full(const MFInputSocket &s GVSpan MFNetworkEvaluationStorage::get_single_input__single(const MFInputSocket &socket) { const MFOutputSocket &origin = *socket.origin(); - Value *any_value = m_value_per_output_id[origin.id()]; + Value *any_value = value_per_output_id_[origin.id()]; BLI_assert(any_value != nullptr); if (any_value->type == ValueType::OwnSingle) { @@ -1005,14 +1005,14 @@ GVSpan MFNetworkEvaluationStorage::get_single_input__single(const MFInputSocket GVArraySpan MFNetworkEvaluationStorage::get_vector_input__full(const MFInputSocket &socket) { const MFOutputSocket &origin = *socket.origin(); - Value *any_value = m_value_per_output_id[origin.id()]; + Value *any_value = value_per_output_id_[origin.id()]; BLI_assert(any_value != nullptr); if (any_value->type == ValueType::OwnVector) { OwnVectorValue *value = (OwnVectorValue *)any_value; if (value->vector_array->size() == 1) { GSpan span = (*value->vector_array)[0]; - return GVArraySpan(span, m_min_array_size); + return GVArraySpan(span, min_array_size_); } else { return *value->vector_array; @@ -1034,7 +1034,7 @@ GVArraySpan MFNetworkEvaluationStorage::get_vector_input__full(const MFInputSock GVArraySpan MFNetworkEvaluationStorage::get_vector_input__single(const MFInputSocket &socket) { const MFOutputSocket &origin = *socket.origin(); - Value *any_value = m_value_per_output_id[origin.id()]; + Value *any_value = value_per_output_id_[origin.id()]; BLI_assert(any_value != nullptr); if (any_value->type == ValueType::OwnVector) { |