[Bf-blender-cvs] [7b0ddb24201] functions: replace MFMask with IndexMask

Jacques Lucke noreply at git.blender.org
Thu Dec 19 13:21:18 CET 2019


Commit: 7b0ddb24201b54062c618223e791c0541feb43d6
Author: Jacques Lucke
Date:   Thu Dec 19 10:11:31 2019 +0100
Branches: functions
https://developer.blender.org/rB7b0ddb24201b54062c618223e791c0541feb43d6

replace MFMask with IndexMask

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

R071	source/blender/functions/FN_multi_function_mask.h	source/blender/blenlib/BLI_index_mask.h
M	source/blender/blenlib/CMakeLists.txt
M	source/blender/functions/CMakeLists.txt
M	source/blender/functions/FN_cpp_type.h
M	source/blender/functions/FN_multi_function.h
M	source/blender/functions/intern/cpp_types.cc
M	source/blender/functions/intern/inlined_tree_multi_function_network/mappings_nodes.cc
M	source/blender/functions/intern/multi_functions/customizable.h
M	source/blender/functions/intern/multi_functions/lists.cc
M	source/blender/functions/intern/multi_functions/lists.h
M	source/blender/functions/intern/multi_functions/mixed.cc
M	source/blender/functions/intern/multi_functions/mixed.h
M	source/blender/functions/intern/multi_functions/network.cc
M	source/blender/functions/intern/multi_functions/network.h
M	source/blender/functions/intern/multi_functions/particles.cc
M	source/blender/functions/intern/multi_functions/particles.h
M	source/blender/functions/intern/multi_functions/surface_hook.cc
M	source/blender/functions/intern/multi_functions/surface_hook.h
M	source/blender/functions/intern/multi_functions/vectorize.cc
M	source/blender/functions/intern/multi_functions/vectorize.h
M	source/blender/simulations/bparticles/particle_function.cpp

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

diff --git a/source/blender/functions/FN_multi_function_mask.h b/source/blender/blenlib/BLI_index_mask.h
similarity index 71%
rename from source/blender/functions/FN_multi_function_mask.h
rename to source/blender/blenlib/BLI_index_mask.h
index a6fade0b3ba..82c082b1955 100644
--- a/source/blender/functions/FN_multi_function_mask.h
+++ b/source/blender/blenlib/BLI_index_mask.h
@@ -1,20 +1,17 @@
-#ifndef __FN_MULTI_FUNCTION_MASK_H__
-#define __FN_MULTI_FUNCTION_MASK_H__
+#ifndef __BLI_INDEX_MASK_H__
+#define __BLI_INDEX_MASK_H__
 
-#include "BLI_index_range.h"
 #include "BLI_array_ref.h"
+#include "BLI_index_range.h"
 
-namespace FN {
-
-using BLI::ArrayRef;
-using BLI::IndexRange;
+namespace BLI {
 
-class MFMask {
+class IndexMask {
  private:
   ArrayRef<uint> m_indices;
 
  public:
-  MFMask(ArrayRef<uint> indices) : m_indices(indices)
+  IndexMask(ArrayRef<uint> indices) : m_indices(indices)
   {
 #ifdef DEBUG
     for (uint i = 1; i < indices.size(); i++) {
@@ -23,11 +20,11 @@ class MFMask {
 #endif
   }
 
-  MFMask(IndexRange range) : m_indices(range.as_array_ref())
+  IndexMask(IndexRange range) : m_indices(range.as_array_ref())
   {
   }
 
-  MFMask(const std::initializer_list<uint> &list) : MFMask(ArrayRef<uint>(list))
+  IndexMask(const std::initializer_list<uint> &list) : IndexMask(ArrayRef<uint>(list))
   {
   }
 
@@ -73,6 +70,6 @@ class MFMask {
   }
 };
 
-}  // namespace FN
+}  // namespace BLI
 
-#endif /* __FN_MULTI_FUNCTION_MASK_H__ */
+#endif /* __BLI_INDEX_MASK_H__ */
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 83953396cfa..4ec31a827af 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -273,6 +273,7 @@ set(SRC
   BLI_multi_vector.h
   BLI_utility_mixins.h
   BLI_static_class_ids.h
+  BLI_index_mask.h
 )
 
 set(LIB
diff --git a/source/blender/functions/CMakeLists.txt b/source/blender/functions/CMakeLists.txt
index 989f38b6de8..e321271e4a1 100644
--- a/source/blender/functions/CMakeLists.txt
+++ b/source/blender/functions/CMakeLists.txt
@@ -59,7 +59,6 @@ set(SRC
   FN_multi_function_context.h
   FN_multi_function_data_type.h
   FN_multi_function_dependencies.h
-  FN_multi_function_mask.h
   FN_multi_function_network.h
   FN_multi_function_param_type.h
   FN_multi_function.h
diff --git a/source/blender/functions/FN_cpp_type.h b/source/blender/functions/FN_cpp_type.h
index 47c4eb8a47d..1ff6b1714e8 100644
--- a/source/blender/functions/FN_cpp_type.h
+++ b/source/blender/functions/FN_cpp_type.h
@@ -4,10 +4,12 @@
 #include "BLI_string_ref.h"
 #include "BLI_utility_mixins.h"
 #include "BLI_vector.h"
+#include "BLI_index_mask.h"
 
 namespace FN {
 
 using BLI::ArrayRef;
+using BLI::IndexMask;
 using BLI::StringRef;
 using BLI::StringRefNull;
 
@@ -15,33 +17,33 @@ class CPPType {
  public:
   using ConstructDefaultF = void (*)(void *ptr);
   using ConstructDefaultNF = void (*)(void *ptr, uint n);
-  using ConstructDefaultIndicesF = void (*)(void *ptr, ArrayRef<uint> indices);
+  using ConstructDefaultIndicesF = void (*)(void *ptr, IndexMask index_mask);
 
   using DestructF = void (*)(void *ptr);
   using DestructNF = void (*)(void *ptr, uint n);
-  using DestructIndicesF = void (*)(void *ptr, ArrayRef<uint> indices);
+  using DestructIndicesF = void (*)(void *ptr, IndexMask index_mask);
 
   using CopyToInitializedF = void (*)(const void *src, void *dst);
   using CopyToInitializedNF = void (*)(const void *src, void *dst, uint n);
-  using CopyToInitializedIndicesF = void (*)(const void *src, void *dst, ArrayRef<uint> indices);
+  using CopyToInitializedIndicesF = void (*)(const void *src, void *dst, IndexMask index_mask);
 
   using CopyToUninitializedF = void (*)(const void *src, void *dst);
   using CopyToUninitializedNF = void (*)(const void *src, void *dst, uint n);
-  using CopyToUninitializedIndicesF = void (*)(const void *src, void *dst, ArrayRef<uint> indices);
+  using CopyToUninitializedIndicesF = void (*)(const void *src, void *dst, IndexMask index_mask);
 
   using RelocateToInitializedF = void (*)(void *src, void *dst);
   using RelocateToInitializedNF = void (*)(void *src, void *dst, uint n);
-  using RelocateToInitializedIndicesF = void (*)(void *src, void *dst, ArrayRef<uint> indices);
+  using RelocateToInitializedIndicesF = void (*)(void *src, void *dst, IndexMask index_mask);
 
   using RelocateToUninitializedF = void (*)(void *src, void *dst);
   using RelocateToUninitializedNF = void (*)(void *src, void *dst, uint n);
-  using RelocateToUninitializedIndicesF = void (*)(void *src, void *dst, ArrayRef<uint> indices);
+  using RelocateToUninitializedIndicesF = void (*)(void *src, void *dst, IndexMask index_mask);
 
   using FillInitializedF = void (*)(const void *value, void *dst, uint n);
-  using FillInitializedIndicesF = void (*)(const void *value, void *dst, ArrayRef<uint> indices);
+  using FillInitializedIndicesF = void (*)(const void *value, void *dst, IndexMask index_mask);
 
   using FillUninitializedF = void (*)(const void *value, void *dst, uint n);
-  using FillUninitializedIndicesF = void (*)(const void *value, void *dst, ArrayRef<uint> indices);
+  using FillUninitializedIndicesF = void (*)(const void *value, void *dst, IndexMask index_mask);
 
   CPPType(std::string name,
           uint size,
@@ -140,11 +142,11 @@ class CPPType {
     m_construct_default_n(ptr, n);
   }
 
-  void construct_default_indices(void *ptr, ArrayRef<uint> indices) const
+  void construct_default_indices(void *ptr, IndexMask index_mask) const
   {
     BLI_assert(this->pointer_has_valid_alignment(ptr));
 
-    m_construct_default_indices(ptr, indices);
+    m_construct_default_indices(ptr, index_mask);
   }
 
   void destruct(void *ptr) const
@@ -161,11 +163,11 @@ class CPPType {
     m_destruct_n(ptr, n);
   }
 
-  void destruct_indices(void *ptr, ArrayRef<uint> indices) const
+  void destruct_indices(void *ptr, IndexMask index_mask) const
   {
     BLI_assert(this->pointer_has_valid_alignment(ptr));
 
-    m_destruct_indices(ptr, indices);
+    m_destruct_indices(ptr, index_mask);
   }
 
   void copy_to_initialized(const void *src, void *dst) const
@@ -184,12 +186,12 @@ class CPPType {
     m_copy_to_initialized_n(src, dst, n);
   }
 
-  void copy_to_initialized_indices(const void *src, void *dst, ArrayRef<uint> indices) const
+  void copy_to_initialized_indices(const void *src, void *dst, IndexMask index_mask) const
   {
     BLI_assert(this->pointer_has_valid_alignment(src));
     BLI_assert(this->pointer_has_valid_alignment(dst));
 
-    m_copy_to_initialized_indices(src, dst, indices);
+    m_copy_to_initialized_indices(src, dst, index_mask);
   }
 
   void copy_to_uninitialized(const void *src, void *dst) const
@@ -208,12 +210,12 @@ class CPPType {
     m_copy_to_uninitialized_n(src, dst, n);
   }
 
-  void copy_to_uninitialized_indices(const void *src, void *dst, ArrayRef<uint> indices) const
+  void copy_to_uninitialized_indices(const void *src, void *dst, IndexMask index_mask) const
   {
     BLI_assert(this->pointer_has_valid_alignment(src));
     BLI_assert(this->pointer_has_valid_alignment(dst));
 
-    m_copy_to_uninitialized_indices(src, dst, indices);
+    m_copy_to_uninitialized_indices(src, dst, index_mask);
   }
 
   void relocate_to_initialized(void *src, void *dst) const
@@ -232,12 +234,12 @@ class CPPType {
     m_relocate_to_initialized_n(src, dst, n);
   }
 
-  void relocate_to_initialized_indices(void *src, void *dst, ArrayRef<uint> indices) const
+  void relocate_to_initialized_indices(void *src, void *dst, IndexMask index_mask) const
   {
     BLI_assert(this->pointer_has_valid_alignment(src));
     BLI_assert(this->pointer_has_valid_alignment(dst));
 
-    m_relocate_to_initialized_indices(src, dst, indices);
+    m_relocate_to_initialized_indices(src, dst, index_mask);
   }
 
   void relocate_to_uninitialized(void *src, void *dst) const
@@ -256,12 +258,12 @@ class CPPType {
     m_relocate_to_uninitialized_n(src, dst, n);
   }
 
-  void relocate_to_uninitialized_indices(void *src, void *dst, ArrayRef<uint> indices) const
+  void relocate_to_uninitialized_indices(void *src, void *dst, IndexMask index_mask) const
   {
     BLI_assert(this->pointer_has_valid_alignment(src));
     BLI_assert(this->pointer_has_valid_alignment(dst));
 
-    m_relocate_to_uninitialized_indices(src, dst, indices);
+    m_relocate_to_uninitialized_indices(src, dst, index_mask);
   }
 
   void fill_initialized(const void *value, void *dst, uint n) const
@@ -272,12 +274,12 @@ class CPPType {
     m_fill_initialized(value, dst, n);
   }
 
-  void fill_initialized_indices(const void *value, void *dst, ArrayRef<uint> indices) const
+  void fill_initialized_indices(const void *value, void *dst, IndexMask index_mask) const
   {
     BLI_assert(this->pointer_has_valid_alignment(value));
     BLI_assert(this->pointer_has_valid_alignment(dst));
 
-    m_fill_initialized_indices(value, dst, indices);
+    m_fill_initialized_indices(value, dst, index_mask);
   }
 
   void fill_uninitialized(const void *value, void *dst, uint n) const
@@ -288,12 +290,12 @@ class CPPType {
     m_fill_uninitialized(value, dst, n);
   }
 
-  void fill_uninitialized_indices(const void *value, void *dst, ArrayRef<uint> indices) const
+  void fill_uninitialized_indices(const void *value, void *dst, IndexMask index_mask) const
   {
     BLI_assert(this->pointer_has_valid_alignment(value));
     BLI_assert(this->pointer_has_valid_alignment(dst));
 
-    m_fill_uninitialized_indices(value, dst, indices);
+    m_fill_uninitialized_indices(value, dst, index_mask);
   }
 
   friend bool operator==(const CPPType &a, const CPPType &b)
diff --git a/source/blender/functions/FN_multi_function.h b/source/blender/functions/FN_multi_function.h
index 43e56ddd625..27c05c6ec65 100644
--- a/source/blender/functions/FN_multi_function.h
+++ b/source/blender/functions/FN_multi_function.h
@@ -7,7 +7,6 @@
 #include "FN_generic_virtual_list_list_ref.h"
 #include "FN_multi_function_data_type.h"
 #include "FN_multi_function_param_type.h"
-#include "FN_multi_function_mask.h"
 #include "FN_multi_function_context.h"
 
 #include "BLI_vector.h"
@@ -158,7 +157,7 @@ class MultiFunction {
   v

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list