[Bf-blender-cvs] [42b88c00886] master: Functions: simplify multi-function parameters
Jacques Lucke
noreply at git.blender.org
Fri Jan 6 11:51:06 CET 2023
Commit: 42b88c008861b6b7a12687739161436fea78c499
Author: Jacques Lucke
Date: Fri Jan 6 11:50:56 2023 +0100
Branches: master
https://developer.blender.org/rB42b88c008861b6b7a12687739161436fea78c499
Functions: simplify multi-function parameters
The use of `std::variant` allows combining the four vectors
into one which more closely matches the intend and avoids
a workaround used before.
Note that this uses `std::get_if` instead of `std::get` because
`std::get` is only available since macOS 10.14.
===================================================================
M source/blender/functions/FN_multi_function_params.hh
M source/blender/functions/FN_multi_function_signature.hh
M source/blender/functions/intern/multi_function_params.cc
===================================================================
diff --git a/source/blender/functions/FN_multi_function_params.hh b/source/blender/functions/FN_multi_function_params.hh
index 16a33c9cda7..cfcc930c67b 100644
--- a/source/blender/functions/FN_multi_function_params.hh
+++ b/source/blender/functions/FN_multi_function_params.hh
@@ -12,6 +12,7 @@
*/
#include <mutex>
+#include <variant>
#include "BLI_generic_pointer.hh"
#include "BLI_generic_vector_array.hh"
@@ -28,10 +29,8 @@ class MFParamsBuilder {
const MFSignature *signature_;
IndexMask mask_;
int64_t min_array_size_;
- Vector<GVArray> virtual_arrays_;
- Vector<GMutableSpan> mutable_spans_;
- Vector<const GVVectorArray *> virtual_vector_arrays_;
- Vector<GVectorArray *> vector_arrays_;
+ Vector<std::variant<GVArray, GMutableSpan, const GVVectorArray *, GVectorArray *>>
+ actual_params_;
std::mutex mutex_;
Vector<std::pair<int, GMutableSpan>> dummy_output_spans_;
@@ -41,10 +40,7 @@ class MFParamsBuilder {
MFParamsBuilder(const MFSignature &signature, const IndexMask mask)
: signature_(&signature), mask_(mask), min_array_size_(mask.min_array_size())
{
- virtual_arrays_.reserve(signature.virtual_array_num);
- mutable_spans_.reserve(signature.span_num);
- virtual_vector_arrays_.reserve(signature.virtual_vector_array_num);
- vector_arrays_.reserve(signature.vector_array_num);
+ actual_params_.reserve(signature.param_types.size());
}
public:
@@ -58,32 +54,41 @@ class MFParamsBuilder {
template<typename T> void add_readonly_single_input_value(T value, StringRef expected_name = "")
{
this->assert_current_param_type(MFParamType::ForSingleInput(CPPType::get<T>()), expected_name);
- virtual_arrays_.append_unchecked_as(
- varray_tag::single{}, CPPType::get<T>(), min_array_size_, &value);
+ actual_params_.append_unchecked_as(std::in_place_type<GVArray>,
+ varray_tag::single{},
+ CPPType::get<T>(),
+ min_array_size_,
+ &value);
}
template<typename T> void add_readonly_single_input(const T *value, StringRef expected_name = "")
{
this->assert_current_param_type(MFParamType::ForSingleInput(CPPType::get<T>()), expected_name);
- virtual_arrays_.append_unchecked_as(
- varray_tag::single_ref{}, CPPType::get<T>(), min_array_size_, value);
+ actual_params_.append_unchecked_as(std::in_place_type<GVArray>,
+ varray_tag::single_ref{},
+ CPPType::get<T>(),
+ min_array_size_,
+ value);
}
void add_readonly_single_input(const GSpan span, StringRef expected_name = "")
{
this->assert_current_param_type(MFParamType::ForSingleInput(span.type()), expected_name);
BLI_assert(span.size() >= min_array_size_);
- virtual_arrays_.append_unchecked_as(varray_tag::span{}, span);
+ actual_params_.append_unchecked_as(std::in_place_type<GVArray>, varray_tag::span{}, span);
}
void add_readonly_single_input(GPointer value, StringRef expected_name = "")
{
this->assert_current_param_type(MFParamType::ForSingleInput(*value.type()), expected_name);
- virtual_arrays_.append_unchecked_as(
- varray_tag::single_ref{}, *value.type(), min_array_size_, value.get());
+ actual_params_.append_unchecked_as(std::in_place_type<GVArray>,
+ varray_tag::single_ref{},
+ *value.type(),
+ min_array_size_,
+ value.get());
}
void add_readonly_single_input(GVArray varray, StringRef expected_name = "")
{
this->assert_current_param_type(MFParamType::ForSingleInput(varray.type()), expected_name);
BLI_assert(varray.size() >= min_array_size_);
- virtual_arrays_.append_unchecked_as(std::move(varray));
+ actual_params_.append_unchecked_as(std::in_place_type<GVArray>, std::move(varray));
}
void add_readonly_vector_input(const GVectorArray &vector_array, StringRef expected_name = "")
@@ -101,7 +106,7 @@ class MFParamsBuilder {
{
this->assert_current_param_type(MFParamType::ForVectorInput(ref.type()), expected_name);
BLI_assert(ref.size() >= min_array_size_);
- virtual_vector_arrays_.append_unchecked(&ref);
+ actual_params_.append_unchecked_as(std::in_place_type<const GVVectorArray *>, &ref);
}
template<typename T> void add_uninitialized_single_output(T *value, StringRef expected_name = "")
@@ -113,7 +118,7 @@ class MFParamsBuilder {
{
this->assert_current_param_type(MFParamType::ForSingleOutput(ref.type()), expected_name);
BLI_assert(ref.size() >= min_array_size_);
- mutable_spans_.append_unchecked(ref);
+ actual_params_.append_unchecked_as(std::in_place_type<GMutableSpan>, ref);
}
void add_ignored_single_output(StringRef expected_name = "")
{
@@ -124,7 +129,7 @@ class MFParamsBuilder {
const CPPType &type = param_type.data_type().single_type();
/* An empty span indicates that this is ignored. */
const GMutableSpan dummy_span{type};
- mutable_spans_.append_unchecked(dummy_span);
+ actual_params_.append_unchecked_as(std::in_place_type<GMutableSpan>, dummy_span);
}
void add_vector_output(GVectorArray &vector_array, StringRef expected_name = "")
@@ -132,14 +137,14 @@ class MFParamsBuilder {
this->assert_current_param_type(MFParamType::ForVectorOutput(vector_array.type()),
expected_name);
BLI_assert(vector_array.size() >= min_array_size_);
- vector_arrays_.append_unchecked(&vector_array);
+ actual_params_.append_unchecked_as(std::in_place_type<GVectorArray *>, &vector_array);
}
void add_single_mutable(GMutableSpan ref, StringRef expected_name = "")
{
this->assert_current_param_type(MFParamType::ForMutableSingle(ref.type()), expected_name);
BLI_assert(ref.size() >= min_array_size_);
- mutable_spans_.append_unchecked(ref);
+ actual_params_.append_unchecked_as(std::in_place_type<GMutableSpan>, ref);
}
void add_vector_mutable(GVectorArray &vector_array, StringRef expected_name = "")
@@ -147,7 +152,7 @@ class MFParamsBuilder {
this->assert_current_param_type(MFParamType::ForMutableVector(vector_array.type()),
expected_name);
BLI_assert(vector_array.size() >= min_array_size_);
- vector_arrays_.append_unchecked(&vector_array);
+ actual_params_.append_unchecked_as(std::in_place_type<GVectorArray *>, &vector_array);
}
GMutableSpan computed_array(int param_index)
@@ -155,8 +160,7 @@ class MFParamsBuilder {
BLI_assert(ELEM(signature_->param_types[param_index].category(),
MFParamCategory::SingleOutput,
MFParamCategory::SingleMutable));
- int data_index = signature_->data_index(param_index);
- return mutable_spans_[data_index];
+ return *std::get_if<GMutableSpan>(&actual_params_[param_index]);
}
GVectorArray &computed_vector_array(int param_index)
@@ -164,8 +168,7 @@ class MFParamsBuilder {
BLI_assert(ELEM(signature_->param_types[param_index].category(),
MFParamCategory::VectorOutput,
MFParamCategory::VectorMutable));
- int data_index = signature_->data_index(param_index);
- return *vector_arrays_[data_index];
+ return **std::get_if<GVectorArray *>(&actual_params_[param_index]);
}
ResourceScope &resource_scope()
@@ -205,8 +208,7 @@ class MFParamsBuilder {
int current_param_index() const
{
- return virtual_arrays_.size() + mutable_spans_.size() + virtual_vector_arrays_.size() +
- vector_arrays_.size();
+ return actual_params_.size();
}
};
@@ -227,8 +229,7 @@ class MFParams {
const GVArray &readonly_single_input(int param_index, StringRef name = "")
{
this->assert_correct_param(param_index, name, MFParamCategory::SingleInput);
- int data_index = builder_->signature_->data_index(param_index);
- return builder_->virtual_arrays_[data_index];
+ return *std::get_if<GVArray>(&builder_->actual_params_[param_index]);
}
/**
@@ -240,8 +241,7 @@ class MFParams {
bool single_output_is_required(int param_index, StringRef name = "")
{
this->assert_correct_param(param_index, name, MFParamCategory::SingleOutput);
- int data_index = builder_->signature_->data_index(param_index);
- return !builder_->mutable_spans_[data_index].is_empty();
+ return !std::get_if<GMutableSpan>(&builder_->actual_params_[param_index])->is_empty();
}
template<typename T>
@@ -252,14 +252,13 @@ class MFParams {
GMutableSpan uninitialized_single_output(int param_index, StringRef name = "")
{
this->assert_correct_param(param_index, name, MFParamCategory::SingleOutput);
- int data_index = builder_->signature_->data_index(param_index);
- GMutableSpan span = builder_->mutable_spans_[data_index];
+ GMutableSpan span = *std::get_if<GMutableSpan>(&builder_->actual_params_[param_index]);
if (!span.is_empty()) {
return span;
}
/* The output is ignored by the caller, but the multi-function does not handle this case. So
* create a temporary buffer that the multi-function can write to. */
- return this->ensure_dummy_single_output(data_index);
+ return this->ensure_dummy_single_output(param_index);
}
/**
@@ -274,8 +273,7 @@ class MFParams {
GMutableSpan uninitialized_single_output_if_required(int param_index, StringRef name = "")
{
this->assert_correct_param(param_index, name, MFParamCategory::SingleOutput);
- int data_index = builder_->signature_->data_index(param_index);
- return builder_->mutable_spans_[data_index];
+ return *std::get_if<GMutableSpan>(&builder_->actual_params_[param_index]);
}
template<typename T>
@@ -287,8 +285,7 @@ class MFParams {
const GVVectorArray &readonly_vector_input(int param_index, StringRef name = "")
{
this->assert_correct_param(param_index, name, MFParamCategory::VectorInput);
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list