[Bf-blender-cvs] [111a77e8182] master: Cleanup: remove dead code
Jacques Lucke
noreply at git.blender.org
Sun Mar 7 17:03:38 CET 2021
Commit: 111a77e81827705119fb82f8191a41dd8752a888
Author: Jacques Lucke
Date: Sun Mar 7 17:03:20 2021 +0100
Branches: master
https://developer.blender.org/rB111a77e81827705119fb82f8191a41dd8752a888
Cleanup: remove dead code
===================================================================
M source/blender/blenkernel/intern/simulation.cc
M source/blender/functions/CMakeLists.txt
D source/blender/functions/FN_attributes_ref.hh
D source/blender/functions/intern/attributes_ref.cc
D source/blender/functions/tests/FN_attributes_ref_test.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/simulation.cc b/source/blender/blenkernel/intern/simulation.cc
index 6b46804c251..216563b860d 100644
--- a/source/blender/blenkernel/intern/simulation.cc
+++ b/source/blender/blenkernel/intern/simulation.cc
@@ -54,7 +54,6 @@
#include "BLI_map.hh"
#include "BLT_translation.h"
-#include "FN_attributes_ref.hh"
#include "FN_multi_function_network_evaluation.hh"
#include "FN_multi_function_network_optimization.hh"
diff --git a/source/blender/functions/CMakeLists.txt b/source/blender/functions/CMakeLists.txt
index 429959f9c33..e4a0b154a07 100644
--- a/source/blender/functions/CMakeLists.txt
+++ b/source/blender/functions/CMakeLists.txt
@@ -27,7 +27,6 @@ set(INC_SYS
)
set(SRC
- intern/attributes_ref.cc
intern/cpp_types.cc
intern/multi_function.cc
intern/multi_function_builder.cc
@@ -36,7 +35,6 @@ set(SRC
intern/multi_function_network_optimization.cc
FN_array_spans.hh
- FN_attributes_ref.hh
FN_cpp_type.hh
FN_generic_pointer.hh
FN_generic_value_map.hh
@@ -63,7 +61,6 @@ blender_add_lib(bf_functions "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
if(WITH_GTESTS)
set(TEST_SRC
tests/FN_array_spans_test.cc
- tests/FN_attributes_ref_test.cc
tests/FN_cpp_type_test.cc
tests/FN_generic_vector_array_test.cc
tests/FN_multi_function_network_test.cc
diff --git a/source/blender/functions/FN_attributes_ref.hh b/source/blender/functions/FN_attributes_ref.hh
deleted file mode 100644
index a9236f73549..00000000000
--- a/source/blender/functions/FN_attributes_ref.hh
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#pragma once
-
-/** \file
- * \ingroup fn
- *
- * An AttributesRef references multiple arrays of equal length. Each array has a corresponding name
- * and index.
- */
-
-#include <optional>
-
-#include "FN_spans.hh"
-
-#include "BLI_linear_allocator.hh"
-#include "BLI_map.hh"
-#include "BLI_utility_mixins.hh"
-#include "BLI_vector_set.hh"
-
-namespace blender::fn {
-
-class AttributesInfo;
-
-class AttributesInfoBuilder : NonCopyable, NonMovable {
- private:
- LinearAllocator<> allocator_;
- VectorSet<std::string> names_;
- Vector<const CPPType *> types_;
- Vector<void *> defaults_;
-
- friend AttributesInfo;
-
- public:
- AttributesInfoBuilder() = default;
- ~AttributesInfoBuilder();
-
- template<typename T> bool add(StringRef name, const T &default_value)
- {
- return this->add(name, CPPType::get<T>(), static_cast<const void *>(&default_value));
- }
-
- bool add(StringRef name, const CPPType &type, const void *default_value = nullptr);
-};
-
-/**
- * Stores which attributes are in an AttributesRef. Every attribute has a unique index, a unique
- * name, a type and a default value.
- */
-class AttributesInfo : NonCopyable, NonMovable {
- private:
- LinearAllocator<> allocator_;
- Map<StringRefNull, int> index_by_name_;
- Vector<StringRefNull> name_by_index_;
- Vector<const CPPType *> type_by_index_;
- Vector<void *> defaults_;
-
- public:
- AttributesInfo() = default;
- AttributesInfo(const AttributesInfoBuilder &builder);
- ~AttributesInfo();
-
- int size() const
- {
- return name_by_index_.size();
- }
-
- IndexRange index_range() const
- {
- return name_by_index_.index_range();
- }
-
- StringRefNull name_of(int index) const
- {
- return name_by_index_[index];
- }
-
- int index_of(StringRef name) const
- {
- return index_by_name_.lookup_as(name);
- }
-
- const void *default_of(int index) const
- {
- return defaults_[index];
- }
-
- const void *default_of(StringRef name) const
- {
- return this->default_of(this->index_of(name));
- }
-
- template<typename T> const T &default_of(int index) const
- {
- BLI_assert(type_by_index_[index]->is<T>());
- return *static_cast<T *>(defaults_[index]);
- }
-
- template<typename T> const T &default_of(StringRef name) const
- {
- return this->default_of<T>(this->index_of(name));
- }
-
- const CPPType &type_of(int index) const
- {
- return *type_by_index_[index];
- }
-
- const CPPType &type_of(StringRef name) const
- {
- return this->type_of(this->index_of(name));
- }
-
- bool has_attribute(StringRef name, const CPPType &type) const
- {
- return this->try_index_of(name, type) >= 0;
- }
-
- int try_index_of(StringRef name) const
- {
- return index_by_name_.lookup_default_as(name, -1);
- }
-
- int try_index_of(StringRef name, const CPPType &type) const
- {
- int index = this->try_index_of(name);
- if (index == -1) {
- return -1;
- }
- else if (this->type_of(index) == type) {
- return index;
- }
- else {
- return -1;
- }
- }
-};
-
-/**
- * References multiple arrays that match the description of an AttributesInfo instance. This class
- * is supposed to be relatively cheap to copy. It does not own any of the arrays itself.
- */
-class MutableAttributesRef {
- private:
- const AttributesInfo *info_;
- Span<void *> buffers_;
- IndexRange range_;
-
- friend class AttributesRef;
-
- public:
- MutableAttributesRef(const AttributesInfo &info, Span<void *> buffers, int64_t size)
- : MutableAttributesRef(info, buffers, IndexRange(size))
- {
- }
-
- MutableAttributesRef(const AttributesInfo &info, Span<void *> buffers, IndexRange range)
- : info_(&info), buffers_(buffers), range_(range)
- {
- }
-
- int64_t size() const
- {
- return range_.size();
- }
-
- IndexRange index_range() const
- {
- return IndexRange(this->size());
- }
-
- const AttributesInfo &info() const
- {
- return *info_;
- }
-
- GMutableSpan get(int index) const
- {
- const CPPType &type = info_->type_of(index);
- void *ptr = POINTER_OFFSET(buffers_[index], type.size() * range_.start());
- return GMutableSpan(type, ptr, range_.size());
- }
-
- GMutableSpan get(StringRef name) const
- {
- return this->get(info_->index_of(name));
- }
-
- template<typename T> MutableSpan<T> get(int index) const
- {
- BLI_assert(info_->type_of(index).is<T>());
- return MutableSpan<T>(static_cast<T *>(buffers_[index]) + range_.start(), range_.size());
- }
-
- template<typename T> MutableSpan<T> get(StringRef name) const
- {
- return this->get<T>(info_->index_of(name));
- }
-
- std::optional<GMutableSpan> try_get(StringRef name, const CPPType &type) const
- {
- int index = info_->try_index_of(name, type);
- if (index == -1) {
- return {};
- }
- else {
- return this->get(index);
- }
- }
-
- template<typename T> std::optional<MutableSpan<T>> try_get(StringRef name) const
- {
- int index = info_->try_index_of(name);
- if (index == -1) {
- return {};
- }
- else if (info_->type_of(index).is<T>()) {
- return this->get<T>(index);
- }
- else {
- return {};
- }
- }
-
- MutableAttributesRef slice(IndexRange range) const
- {
- return this->slice(range.start(), range.size());
- }
-
- MutableAttributesRef slice(int64_t start, int64_t size) const
- {
- return MutableAttributesRef(*info_, buffers_, range_.slice(start, size));
- }
-};
-
-class AttributesRef {
- private:
- const AttributesInfo *info_;
- Span<const void *> buffers_;
- IndexRange range_;
-
- public:
- AttributesRef(const AttributesInfo &info, Span<const void *> buffers, int64_t size)
- : AttributesRef(info, buffers, IndexRange(size))
- {
- }
-
- AttributesRef(const AttributesInfo &info, Span<const void *> buffers, IndexRange range)
- : info_(&info), buffers_(buffers), range_(range)
- {
- }
-
- AttributesRef(MutableAttributesRef attributes)
- : info_(attributes.info_), buffers_(attributes.buffers_), range_(attributes.range_)
- {
- }
-
- int64_t size() const
- {
- return range_.size();
- }
-
- const AttributesInfo &info() const
- {
- return *info_;
- }
-
- GSpan get(int index) const
- {
- const CPPType &type = info_->type_of(index);
- const void *ptr = POINTER_OFFSET(buffers_[index], type.size() * range_.start());
- return GSpan(type, ptr, range_.size());
- }
-
- GSpan get(StringRef name) const
- {
- return this->get(info_->index_of(name));
- }
-
- template<typename T> Span<T> get(int index) const
- {
- BLI_assert(info_->type_of(index).is<T>());
- return Span<T>(static_cast<T *>(buffers_[index]) + range_.start(), range_.size());
- }
-
- template<typename T> Span<T> get(StringRef name) const
- {
- return this->get<T>(info_->index_of(name));
- }
-
- std::optional<GSpan> try_get(StringRef name, const CPPType &type) const
- {
- int64_t index = info_->try_index_of(name, type);
- if (index == -1) {
- return {};
- }
- else {
- return this->get(index);
- }
- }
-
- template<typename T> std::optional<Span<T>> try_get(StringRef name) const
- {
- int index = info_->try_index_of(name);
- if (index == -1) {
- return {};
- }
- else if (info_->type_of(index).is<T>()) {
- return this->get<T>(index);
- }
- else {
- return {};
- }
- }
-
- AttributesRef slice(IndexRange range) const
- {
- return this->slice(range.start(), range.size());
- }
-
- AttributesRef slice(int64_t start, int64_t size) const
- {
- return AttributesRef(*info_, buffers_, range_.slice(start, size));
- }
-};
-
-} // namespace blender::fn
diff --git a/source/blender/functions/intern/attributes_ref.cc b/source/blender/functions/intern/attributes_ref.cc
deleted file mode 100644
index 9f1e7fa65e5..00000000000
--- a/source/blender/functions/intern/attributes_ref.c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list