griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert changes from main commits that were merged into blender-v4.1-release

Browse Source 
The last good commit was f57e4c5b98.

After this one more fix was committed, this one is preserved as well:
67bd678887.
This commit is contained in:
Brecht Van Lommel
2024-03-18 14:49:11 +01:00
parent 4842bf1101
commit 7a395e2e7f
3443 changed files with 70508 additions and 264669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
source/blender/blenlib/intern/generic_virtual_array.cc
View File

@@ -265,33 +265,21 @@ template<int BufferSize> class GVArrayImpl_For_SmallTrivialSingleValue : public
}
private:
void get(const int64_t index, void *r_value) const final
void get(const int64_t /*index*/, void *r_value) const override
{
this->get_to_uninitialized(index, r_value);
this->copy_value_to(r_value);
}
void get_to_uninitialized(const int64_t /*index*/, void *r_value) const final
void get_to_uninitialized(const int64_t /*index*/, void *r_value) const override
{
memcpy(r_value, &buffer_, type_->size());
this->copy_value_to(r_value);
}
void materialize(const IndexMask &mask, void *dst) const final
void copy_value_to(void *dst) const
{
this->materialize_to_uninitialized(mask, dst);
}
void materialize_to_uninitialized(const IndexMask &mask, void *dst) const final
{
type_->fill_construct_indices(buffer_, dst, mask);
}
void materialize_compressed(const IndexMask &mask, void *dst) const final
{
this->materialize_compressed_to_uninitialized(mask, dst);
}
void materialize_compressed_to_uninitialized(const IndexMask &mask, void *dst) const final
{
type_->fill_construct_n(buffer_, dst, mask.size());
memcpy(dst, &buffer_, type_->size());
}
CommonVArrayInfo common_info() const final
CommonVArrayInfo common_info() const override
{
return CommonVArrayInfo{CommonVArrayInfo::Type::Single, true, &buffer_};
}
@@ -511,29 +499,15 @@ class GVArrayImpl_For_SlicedGVArray : public GVArrayImpl {
return {};
}
void materialize(const IndexMask &mask, void *dst) const final
{
IndexMaskMemory memory;
const IndexMask shifted_mask = mask.shift(offset_, memory);
varray_.materialize(shifted_mask, dst);
}
void materialize_to_uninitialized(const IndexMask &mask, void *dst) const final
{
IndexMaskMemory memory;
const IndexMask shifted_mask = mask.shift(offset_, memory);
varray_.materialize_to_uninitialized(shifted_mask, dst);
}
void materialize_compressed(const IndexMask &mask, void *dst) const final
{
IndexMaskMemory memory;
const IndexMask shifted_mask = mask.shift(offset_, memory);
varray_.materialize_compressed(shifted_mask, dst);
}
void materialize_compressed_to_uninitialized(const IndexMask &mask, void *dst) const override
{
IndexMaskMemory memory;
const IndexMask shifted_mask = mask.shift(offset_, memory);
varray_.materialize_compressed_to_uninitialized(shifted_mask, dst);
IndexMaskFromSegment mask_from_segment;
mask.foreach_segment([&](const IndexMaskSegment segment, const int64_t start) {
const IndexMask &segment_mask = mask_from_segment.update(
{segment.offset() + offset_, segment.base_span()});
varray_.materialize_compressed_to_uninitialized(segment_mask,
POINTER_OFFSET(dst, type_->size() * start));
});
}
};