tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Cleanup: simplify field evaluation

This commit is contained in:
Jacques Lucke 2021-09-26 23:19:31 +02:00
parent 88a2b054da
commit 1cd8a438bb
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source/blender/functions/intern/field.cc
View File

@ -260,20 +260,6 @@ static void build_multi_function_procedure_for_fields(MFProcedure &procedure,
BLI_assert(procedure.validate());
}
/**
* Utility class that destructs elements from a partially initialized array.
*/
struct PartiallyInitializedArray : NonCopyable, NonMovable {
void *buffer;
IndexMask mask;
const CPPType *type;
~PartiallyInitializedArray()
{
this->type->destruct_indices(this->buffer, this->mask);
}
};
/**
* Evaluate fields in the given context. If possible, multiple fields should be evaluated together,
* because that can be more efficient when they share common sub-fields.
@ -387,11 +373,11 @@ Vector<const GVArray *> evaluate_fields(ResourceScope &scope,
/* Allocate a new buffer for the computed result. */
buffer = scope.linear_allocator().allocate(type.size() * array_size, type.alignment());
/* Make sure that elements in the buffer will be destructed. */
PartiallyInitializedArray &destruct_helper = scope.construct<PartiallyInitializedArray>();
destruct_helper.buffer = buffer;
destruct_helper.mask = mask;
destruct_helper.type = &type;
if (!type.is_trivially_destructible()) {
/* Destruct values in the end. */
scope.add_destruct_call(
[buffer, mask, &type]() { type.destruct_indices(buffer, mask); });
}
r_varrays[out_index] = &scope.construct<GVArray_For_GSpan>(
GSpan{type, buffer, array_size});
@ -435,11 +421,11 @@ Vector<const GVArray *> evaluate_fields(ResourceScope &scope,
/* Allocate memory where the computed value will be stored in. */
void *buffer = scope.linear_allocator().allocate(type.size(), type.alignment());
/* Use this to make sure that the value is destructed in the end. */
PartiallyInitializedArray &destruct_helper = scope.construct<PartiallyInitializedArray>();
destruct_helper.buffer = buffer;
destruct_helper.mask = IndexRange(mask_size);
destruct_helper.type = &type;
if (!type.is_trivially_destructible() && mask_size > 0) {
BLI_assert(mask_size == 1);
/* Destruct value in the end. */
scope.add_destruct_call([buffer, &type]() { type.destruct(buffer); });
}
/* Pass output buffer to the procedure executor. */
mf_params.add_uninitialized_single_output({type, buffer, mask_size});