[Bf-blender-cvs] [d1944dee86e] master: Cleanup: remove unused multi-function
Jacques Lucke
noreply at git.blender.org
Tue Apr 12 11:59:31 CEST 2022
Commit: d1944dee86e21b92360be526f129b48600ca0154
Author: Jacques Lucke
Date: Tue Apr 12 11:59:23 2022 +0200
Branches: master
https://developer.blender.org/rBd1944dee86e21b92360be526f129b48600ca0154
Cleanup: remove unused multi-function
===================================================================
M source/blender/functions/FN_multi_function_builder.hh
M source/blender/functions/tests/FN_multi_function_test.cc
===================================================================
diff --git a/source/blender/functions/FN_multi_function_builder.hh b/source/blender/functions/FN_multi_function_builder.hh
index e0ccd2a482d..088a906ce02 100644
--- a/source/blender/functions/FN_multi_function_builder.hh
+++ b/source/blender/functions/FN_multi_function_builder.hh
@@ -389,39 +389,6 @@ template<typename Mut1> class CustomMF_SM : public MultiFunction {
}
};
-/**
- * Generates a multi-function that converts between two types.
- */
-template<typename From, typename To> class CustomMF_Convert : public MultiFunction {
- public:
- CustomMF_Convert()
- {
- static MFSignature signature = create_signature();
- this->set_signature(&signature);
- }
-
- static MFSignature create_signature()
- {
- static std::string name = CPPType::get<From>().name() + " to " + CPPType::get<To>().name();
- MFSignatureBuilder signature{name.c_str()};
- signature.single_input<From>("Input");
- signature.single_output<To>("Output");
- return signature.build();
- }
-
- void call(IndexMask mask, MFParams params, MFContext UNUSED(context)) const override
- {
- const VArray<From> &inputs = params.readonly_single_input<From>(0);
- MutableSpan<To> outputs = params.uninitialized_single_output<To>(1);
-
- mask.to_best_mask_type([&](const auto &mask) {
- for (int64_t i : mask) {
- new (static_cast<void *>(&outputs[i])) To(inputs[i]);
- }
- });
- }
-};
-
/**
* A multi-function that outputs the same value every time. The value is not owned by an instance
* of this function. If #make_value_copy is false, the caller is responsible for destructing and
diff --git a/source/blender/functions/tests/FN_multi_function_test.cc b/source/blender/functions/tests/FN_multi_function_test.cc
index 59d797605e7..577b09cb014 100644
--- a/source/blender/functions/tests/FN_multi_function_test.cc
+++ b/source/blender/functions/tests/FN_multi_function_test.cc
@@ -307,25 +307,6 @@ TEST(multi_function, CustomMF_GenericConstantArray)
}
}
-TEST(multi_function, CustomMF_Convert)
-{
- CustomMF_Convert<float, int> fn;
-
- Array<float> inputs = {5.4f, 7.1f, 9.0f};
- Array<int> outputs(inputs.size(), 0);
-
- MFParamsBuilder params(fn, inputs.size());
- params.add_readonly_single_input(inputs.as_span());
- params.add_uninitialized_single_output(outputs.as_mutable_span());
-
- MFContextBuilder context;
- fn.call({0, 2}, params, context);
-
- EXPECT_EQ(outputs[0], 5);
- EXPECT_EQ(outputs[1], 0);
- EXPECT_EQ(outputs[2], 9);
-}
-
TEST(multi_function, IgnoredOutputs)
{
OptionalOutputsFunction fn;
More information about the Bf-blender-cvs
mailing list