Cleanup: unify naming between different spans

5 files changed, 28 insertions, 28 deletions

diff --git a/source/blender/functions/FN_array_spans.hh b/source/blender/functions/FN_array_spans.hh
index c362fef3630..5f976711e06 100644
--- a/source/blender/functions/FN_array_spans.hh
+++ b/source/blender/functions/FN_array_spans.hh
@@ -158,7 +158,7 @@ class GVArraySpan : public VArraySpanBase<void> {
     this->type_ = &array.type();
     this->virtual_size_ = virtual_size;
     this->category_ = VArraySpanCategory::SingleArray;
-    this->data_.single_array.start = array.buffer();
+    this->data_.single_array.start = array.data();
     this->data_.single_array.size = array.size();
   }
 
diff --git a/source/blender/functions/FN_spans.hh b/source/blender/functions/FN_spans.hh
index d8b381199cc..c50c92cd16d 100644
--- a/source/blender/functions/FN_spans.hh
+++ b/source/blender/functions/FN_spans.hh
@@ -51,12 +51,12 @@ namespace blender::fn {
 class GSpan {
  private:
   const CPPType *type_;
-  const void *buffer_;
+  const void *data_;
   int64_t size_;
 
  public:
   GSpan(const CPPType &type, const void *buffer, int64_t size)
-      : type_(&type), buffer_(buffer), size_(size)
+      : type_(&type), data_(buffer), size_(size)
   {
     BLI_assert(size >= 0);
     BLI_assert(buffer != nullptr || size == 0);
@@ -87,21 +87,21 @@ class GSpan {
     return size_;
   }
 
-  const void *buffer() const
+  const void *data() const
   {
-    return buffer_;
+    return data_;
   }
 
   const void *operator[](int64_t index) const
   {
     BLI_assert(index < size_);
-    return POINTER_OFFSET(buffer_, type_->size() * index);
+    return POINTER_OFFSET(data_, type_->size() * index);
   }
 
   template<typename T> Span<T> typed() const
   {
     BLI_assert(type_->is<T>());
-    return Span<T>((const T *)buffer_, size_);
+    return Span<T>((const T *)data_, size_);
   }
 };
 
@@ -112,12 +112,12 @@ class GSpan {
 class GMutableSpan {
  private:
   const CPPType *type_;
-  void *buffer_;
+  void *data_;
   int64_t size_;
 
  public:
   GMutableSpan(const CPPType &type, void *buffer, int64_t size)
-      : type_(&type), buffer_(buffer), size_(size)
+      : type_(&type), data_(buffer), size_(size)
   {
     BLI_assert(size >= 0);
     BLI_assert(buffer != nullptr || size == 0);
@@ -136,7 +136,7 @@ class GMutableSpan {
 
   operator GSpan() const
   {
-    return GSpan(*type_, buffer_, size_);
+    return GSpan(*type_, data_, size_);
   }
 
   const CPPType &type() const
@@ -154,21 +154,21 @@ class GMutableSpan {
     return size_;
   }
 
-  void *buffer()
+  void *data()
   {
-    return buffer_;
+    return data_;
   }
 
   void *operator[](int64_t index)
   {
     BLI_assert(index < size_);
-    return POINTER_OFFSET(buffer_, type_->size() * index);
+    return POINTER_OFFSET(data_, type_->size() * index);
   }
 
   template<typename T> MutableSpan<T> typed()
   {
     BLI_assert(type_->is<T>());
-    return MutableSpan<T>((T *)buffer_, size_);
+    return MutableSpan<T>((T *)data_, size_);
   }
 };
 
@@ -311,7 +311,7 @@ class GVSpan : public VSpanBase<void> {
     this->type_ = &values.type();
     this->virtual_size_ = values.size();
     this->category_ = VSpanCategory::FullArray;
-    this->data_.full_array.data = values.buffer();
+    this->data_.full_array.data = values.data();
   }
 
   GVSpan(GMutableSpan values) : GVSpan(GSpan(values))
diff --git a/source/blender/functions/intern/multi_function_builder.cc b/source/blender/functions/intern/multi_function_builder.cc
index 06084247e66..c9e8b88ba03 100644
--- a/source/blender/functions/intern/multi_function_builder.cc
+++ b/source/blender/functions/intern/multi_function_builder.cc
@@ -34,7 +34,7 @@ void CustomMF_GenericConstant::call(IndexMask mask,
                                     MFContext UNUSED(context)) const
 {
   GMutableSpan output = params.uninitialized_single_output(0);
-  type_.fill_uninitialized_indices(value_, output.buffer(), mask);
+  type_.fill_uninitialized_indices(value_, output.data(), mask);
 }
 
 uint64_t CustomMF_GenericConstant::hash() const
@@ -111,7 +111,7 @@ void CustomMF_DefaultOutput::call(IndexMask mask, MFParams params, MFContext UNU
     if (param_type.data_type().is_single()) {
       GMutableSpan span = params.uninitialized_single_output(param_index);
       const CPPType &type = span.type();
-      type.fill_uninitialized_indices(type.default_value(), span.buffer(), mask);
+      type.fill_uninitialized_indices(type.default_value(), span.data(), mask);
     }
   }
 }
diff --git a/source/blender/functions/intern/multi_function_network_evaluation.cc b/source/blender/functions/intern/multi_function_network_evaluation.cc
index 58577e31c42..25e983d2eeb 100644
--- a/source/blender/functions/intern/multi_function_network_evaluation.cc
+++ b/source/blender/functions/intern/multi_function_network_evaluation.cc
@@ -390,7 +390,7 @@ BLI_NOINLINE void MFNetworkEvaluator::initialize_remaining_outputs(
       case MFDataType::Single: {
         GVSpan values = storage.get_single_input__full(*socket);
         GMutableSpan output_values = params.uninitialized_single_output(param_index);
-        values.materialize_to_uninitialized(storage.mask(), output_values.buffer());
+        values.materialize_to_uninitialized(storage.mask(), output_values.data());
         break;
       }
       case MFDataType::Vector: {
@@ -524,11 +524,11 @@ MFNetworkEvaluationStorage::~MFNetworkEvaluationStorage()
       GMutableSpan span = value->span;
       const CPPType &type = span.type();
       if (value->is_single_allocated) {
-        type.destruct(span.buffer());
+        type.destruct(span.data());
       }
       else {
-        type.destruct_indices(span.buffer(), mask_);
-        MEM_freeN(span.buffer());
+        type.destruct_indices(span.data(), mask_);
+        MEM_freeN(span.data());
       }
     }
     else if (any_value->type == ValueType::OwnVector) {
@@ -634,11 +634,11 @@ void MFNetworkEvaluationStorage::finish_input_socket(const MFInputSocket &socket
         GMutableSpan span = value->span;
         const CPPType &type = span.type();
         if (value->is_single_allocated) {
-          type.destruct(span.buffer());
+          type.destruct(span.data());
         }
         else {
-          type.destruct_indices(span.buffer(), mask_);
-          MEM_freeN(span.buffer());
+          type.destruct_indices(span.data(), mask_);
+          MEM_freeN(span.data());
         }
         value_per_output_id_[origin.id()] = nullptr;
       }
@@ -791,7 +791,7 @@ GMutableSpan MFNetworkEvaluationStorage::get_mutable_single__full(const MFInputS
     BLI_assert(to_any_value->type == ValueType::OutputSingle);
     GMutableSpan span = ((OutputSingleValue *)to_any_value)->span;
     GVSpan virtual_span = this->get_single_input__full(input);
-    virtual_span.materialize_to_uninitialized(mask_, span.buffer());
+    virtual_span.materialize_to_uninitialized(mask_, span.data());
     return span;
   }
 
@@ -808,7 +808,7 @@ GMutableSpan MFNetworkEvaluationStorage::get_mutable_single__full(const MFInputS
   GVSpan virtual_span = this->get_single_input__full(input);
   void *new_buffer = MEM_mallocN_aligned(min_array_size_ * type.size(), type.alignment(), AT);
   GMutableSpan new_array_ref(type, new_buffer, min_array_size_);
-  virtual_span.materialize_to_uninitialized(mask_, new_array_ref.buffer());
+  virtual_span.materialize_to_uninitialized(mask_, new_array_ref.data());
 
   OwnSingleValue *new_value = allocator_.construct<OwnSingleValue>(
       new_array_ref, to.targets().size(), false);
@@ -953,7 +953,7 @@ GVSpan MFNetworkEvaluationStorage::get_single_input__full(const MFInputSocket &s
   if (any_value->type == ValueType::OwnSingle) {
     OwnSingleValue *value = (OwnSingleValue *)any_value;
     if (value->is_single_allocated) {
-      return GVSpan::FromSingle(value->span.type(), value->span.buffer(), min_array_size_);
+      return GVSpan::FromSingle(value->span.type(), value->span.data(), min_array_size_);
     }
     else {
       return value->span;
diff --git a/source/blender/functions/intern/multi_function_network_optimization.cc b/source/blender/functions/intern/multi_function_network_optimization.cc
index f1e047f01a1..e8fd7afc2ee 100644
--- a/source/blender/functions/intern/multi_function_network_optimization.cc
+++ b/source/blender/functions/intern/multi_function_network_optimization.cc
@@ -265,7 +265,7 @@ static Array<MFOutputSocket *> add_constant_folded_sockets(const MultiFunction &
       case MFDataType::Single: {
         const CPPType &cpp_type = data_type.single_type();
         GMutableSpan array = params.computed_array(param_index);
-        void *buffer = array.buffer();
+        void *buffer = array.data();
         resources.add(buffer, array.type().destruct_cb(), AT);
 
         constant_fn = &resources.construct<CustomMF_GenericConstant>(AT, cpp_type, buffer);