archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: remove MF prefix from some classes in multi-function namespace

Browse Source 
This was missing in rBeedcf1876a6651c38d8f4daa2e65d1fb81f77c5d.
This commit is contained in:
Jacques Lucke
2023-01-14 15:42:52 +01:00
parent 8625495b1c
commit 50980981e3
41 changed files with 93 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/functions/FN_multi_function_builder.hh
View File

@@ -371,12 +371,12 @@ template<typename ElementFn, typename ExecPreset, typename... ParamTags, size_t.
inline void execute_element_fn_as_multi_function(const ElementFn element_fn,
const ExecPreset exec_preset,
const IndexMask mask,
MFParams params,
Params params,
TypeSequence<ParamTags...> /*param_tags*/,
std::index_sequence<I...> /*indices*/)
{
/* Load parameters from #MFParams. */
/* Load parameters from #Params. */
/* Contains `const GVArrayImpl *` for inputs and `T *` for outputs. */
const auto loaded_params = std::make_tuple([&]() {
/* Use `typedef` instead of `using` to work around a compiler bug. */
@@ -453,7 +453,7 @@ inline auto build_multi_function_call_from_element_fn(const ElementFn element_fn
const ExecPreset exec_preset,
TypeSequence<ParamTags...> /*param_tags*/)
{
return [element_fn, exec_preset](const IndexMask mask, MFParams params) {
return [element_fn, exec_preset](const IndexMask mask, Params params) {
execute_element_fn_as_multi_function(element_fn,
exec_preset,
mask,
@@ -481,7 +481,7 @@ template<typename CallFn, typename... ParamTags> class CustomMF : public MultiFu
this->set_signature(&signature_);
}
void call(IndexMask mask, MFParams params, Context /*context*/) const override
void call(IndexMask mask, Params params, Context /*context*/) const override
{
call_fn_(mask, params);
}
@@ -493,8 +493,8 @@ inline auto build_multi_function_with_n_inputs_one_output(const char *name,
const ExecPreset exec_preset,
TypeSequence<In...> /*in_types*/)
{
constexpr auto param_tags = TypeSequence<MFParamTag<ParamCategory::SingleInput, In>...,
MFParamTag<ParamCategory::SingleOutput, Out>>();
constexpr auto param_tags = TypeSequence<ParamTag<ParamCategory::SingleInput, In>...,
ParamTag<ParamCategory::SingleOutput, Out>>();
auto call_fn = build_multi_function_call_from_element_fn(
[element_fn](const In &...in, Out &out) { new (&out) Out(element_fn(in...)); },
exec_preset,
@@ -603,7 +603,7 @@ inline auto SM(const char *name,
const ElementFn element_fn,
const ExecPreset exec_preset = exec_presets::AllSpanOrSingle())
{
constexpr auto param_tags = TypeSequence<MFParamTag<ParamCategory::SingleMutable, Mut1>>();
constexpr auto param_tags = TypeSequence<ParamTag<ParamCategory::SingleMutable, Mut1>>();
auto call_fn = detail::build_multi_function_call_from_element_fn(
element_fn, exec_preset, param_tags);
return detail::CustomMF(name, call_fn, param_tags);
@@ -630,7 +630,7 @@ class CustomMF_GenericConstant : public MultiFunction {
public:
CustomMF_GenericConstant(const CPPType &type, const void *value, bool make_value_copy);
~CustomMF_GenericConstant();
void call(IndexMask mask, MFParams params, Context context) const override;
void call(IndexMask mask, Params params, Context context) const override;
uint64_t hash() const override;
bool equals(const MultiFunction &other) const override;
};
@@ -646,7 +646,7 @@ class CustomMF_GenericConstantArray : public MultiFunction {
public:
CustomMF_GenericConstantArray(GSpan array);
void call(IndexMask mask, MFParams params, Context context) const override;
void call(IndexMask mask, Params params, Context context) const override;
};
/**
@@ -665,7 +665,7 @@ template<typename T> class CustomMF_Constant : public MultiFunction {
this->set_signature(&signature_);
}
void call(IndexMask mask, MFParams params, Context /*context*/) const override
void call(IndexMask mask, Params params, Context /*context*/) const override
{
MutableSpan<T> output = params.uninitialized_single_output<T>(0);
mask.to_best_mask_type([&](const auto &mask) {
@@ -705,7 +705,7 @@ class CustomMF_DefaultOutput : public MultiFunction {
public:
CustomMF_DefaultOutput(Span<DataType> input_types, Span<DataType> output_types);
void call(IndexMask mask, MFParams params, Context context) const override;
void call(IndexMask mask, Params params, Context context) const override;
};
class CustomMF_GenericCopy : public MultiFunction {
@@ -714,7 +714,7 @@ class CustomMF_GenericCopy : public MultiFunction {
public:
CustomMF_GenericCopy(DataType data_type);
void call(IndexMask mask, MFParams params, Context context) const override;
void call(IndexMask mask, Params params, Context context) const override;
};
} // namespace blender::fn::multi_function