[Bf-blender-cvs] [c9f37f50dd0] temp-lineart-contained: Functions: support materialize virtual array to initialized span

Jacques Lucke noreply at git.blender.org
Wed May 12 04:15:49 CEST 2021


Commit: c9f37f50dd05edd0da24a279d4385e43f5b7bf42
Author: Jacques Lucke
Date:   Mon May 10 10:28:24 2021 +0200
Branches: temp-lineart-contained
https://developer.blender.org/rBc9f37f50dd05edd0da24a279d4385e43f5b7bf42

Functions: support materialize virtual array to initialized span

===================================================================

M	source/blender/functions/FN_generic_virtual_array.hh
M	source/blender/functions/intern/generic_virtual_array.cc

===================================================================

diff --git a/source/blender/functions/FN_generic_virtual_array.hh b/source/blender/functions/FN_generic_virtual_array.hh
index 2e91479dd30..aca752583c4 100644
--- a/source/blender/functions/FN_generic_virtual_array.hh
+++ b/source/blender/functions/FN_generic_virtual_array.hh
@@ -135,6 +135,9 @@ class GVArray {
     this->get_internal_single(r_value);
   }
 
+  void materialize(void *dst) const;
+  void materialize(const IndexMask mask, void *dst) const;
+
   void materialize_to_uninitialized(void *dst) const;
   void materialize_to_uninitialized(const IndexMask mask, void *dst) const;
 
@@ -162,6 +165,7 @@ class GVArray {
   virtual bool is_single_impl() const;
   virtual void get_internal_single_impl(void *UNUSED(r_value)) const;
 
+  virtual void materialize_impl(const IndexMask mask, void *dst) const;
   virtual void materialize_to_uninitialized_impl(const IndexMask mask, void *dst) const;
 
   virtual const void *try_get_internal_varray_impl() const;
@@ -370,6 +374,11 @@ template<typename T> class GVArray_For_VArray : public GVArray {
     *(T *)r_value = varray_->get_internal_single();
   }
 
+  void materialize_impl(const IndexMask mask, void *dst) const override
+  {
+    varray_->materialize(mask, MutableSpan((T *)dst, mask.min_array_size()));
+  }
+
   void materialize_to_uninitialized_impl(const IndexMask mask, void *dst) const override
   {
     varray_->materialize_to_uninitialized(mask, MutableSpan((T *)dst, mask.min_array_size()));
diff --git a/source/blender/functions/intern/generic_virtual_array.cc b/source/blender/functions/intern/generic_virtual_array.cc
index ca2bd0f806f..a835e7a54a9 100644
--- a/source/blender/functions/intern/generic_virtual_array.cc
+++ b/source/blender/functions/intern/generic_virtual_array.cc
@@ -53,6 +53,24 @@ class GVArray_For_ShallowCopy : public GVArray {
  * GVArray.
  */
 
+void GVArray::materialize(void *dst) const
+{
+  this->materialize(IndexMask(size_), dst);
+}
+
+void GVArray::materialize(const IndexMask mask, void *dst) const
+{
+  this->materialize_impl(mask, dst);
+}
+
+void GVArray::materialize_impl(const IndexMask mask, void *dst) const
+{
+  for (const int64_t i : mask) {
+    void *elem_dst = POINTER_OFFSET(dst, type_->size() * i);
+    this->get(i, elem_dst);
+  }
+}
+
 void GVArray::materialize_to_uninitialized(void *dst) const
 {
   this->materialize_to_uninitialized(IndexMask(size_), dst);



More information about the Bf-blender-cvs mailing list