blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 778 Projects 19 Wiki Activity

Geometry Nodes: Simplify using OutputAttribute in a vector 

Store the optional temporary span storage as a unique_ptr and move
it in the move constructor, to avoid the need to add a special move
constructor that clears the "show_warning" fields from it. Maybe this
is very slightly slower, but we'll need this class less often in the future
anyway.
This commit is contained in:
Hans Goudey 2021-09-16 12:03:32 -05:00
parent 31a0708cb1
commit ddb7cb7e4a
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/blenkernel/BKE_attribute_access.hh
View File

@ -247,7 +247,7 @@ class OutputAttribute {
GVMutableArrayPtr varray_;
AttributeDomain domain_;
SaveFn save_;
std::optional<fn::GVMutableArray_GSpan> optional_span_varray_;
std::unique_ptr<fn::GVMutableArray_GSpan> optional_span_varray_;
bool ignore_old_values_ = false;
bool save_has_been_called_ = false;
@ -265,7 +265,15 @@ class OutputAttribute {
{
}
OutputAttribute(OutputAttribute &&other) = default;
OutputAttribute(OutputAttribute &&other)
: varray_(std::move(other.varray_)),
domain_(other.domain_),
save_(other.save_),
optional_span_varray_(std::move(other.optional_span_varray_)),
ignore_old_values_(other.ignore_old_values_),
save_has_been_called_(other.save_has_been_called_)
{
}
~OutputAttribute();
@ -306,9 +314,10 @@ class OutputAttribute {
fn::GMutableSpan as_span()
{
if (!optional_span_varray_.has_value()) {
if (!optional_span_varray_) {
const bool materialize_old_values = !ignore_old_values_;
optional_span_varray_.emplace(*varray_, materialize_old_values);
optional_span_varray_ = std::make_unique<fn::GVMutableArray_GSpan>(*varray_,
materialize_old_values);
}
fn::GVMutableArray_GSpan &span_varray = *optional_span_varray_;
return span_varray;

2
source/blender/blenkernel/intern/attribute_access.cc
View File

@ -190,7 +190,7 @@ AttributeDomain attribute_domain_highest_priority(Span<AttributeDomain> domains)
void OutputAttribute::save()
{
save_has_been_called_ = true;
if (optional_span_varray_.has_value()) {
if (optional_span_varray_) {
optional_span_varray_->save();
}
if (save_) {