blender
/
blender
137
404
Fork 586
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

BLI: speedup adding to VectorSet by removing a check

This commit is contained in:
Jacques Lucke 2019-09-14 14:41:19 +02:00
parent 5b00ecf70b
commit a98760f7da
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/blenlib/BLI_vector.h
View File

@ -512,6 +512,14 @@ template<typename T, uint N = 4, typename Allocator = GuardedAllocator> class Ve
return m_end;
}
/**
* Get the current capacity of the vector.
*/
uint capacity() const
{
return (uint)(m_capacity_end - m_begin);
}
void print_stats() const
{
std::cout << "Small Vector at " << (void *)this << ":" << std::endl;
@ -538,11 +546,6 @@ template<typename T, uint N = 4, typename Allocator = GuardedAllocator> class Ve
}
}
uint capacity() const
{
return (uint)(m_capacity_end - m_begin);
}
BLI_NOINLINE void grow(uint min_capacity)
{
if (this->capacity() >= min_capacity) {

14
source/blender/blenlib/BLI_vector_set.h
View File

@ -115,19 +115,22 @@ template<typename T, typename Allocator = GuardedAllocator> class VectorSet {
Vector<T, 4, Allocator> m_elements;
public:
VectorSet() = default;
VectorSet()
{
BLI_assert(m_array.slots_usable() <= m_elements.capacity());
}
VectorSet(ArrayRef<T> values)
VectorSet(ArrayRef<T> values) : VectorSet()
{
this->add_multiple(values);
}
VectorSet(const std::initializer_list<T> &values)
VectorSet(const std::initializer_list<T> &values) : VectorSet()
{
this->add_multiple(values);
}
VectorSet(const Vector<T> &values)
VectorSet(const Vector<T> &values) : VectorSet()
{
this->add_multiple(values);
}
@ -316,7 +319,7 @@ template<typename T, typename Allocator = GuardedAllocator> class VectorSet {
{
uint index = m_elements.size();
slot.set_index(index);
m_elements.append(std::forward<ForwardT>(value));
m_elements.append_unchecked(std::forward<ForwardT>(value));
m_array.update__empty_to_set();
}
@ -336,6 +339,7 @@ template<typename T, typename Allocator = GuardedAllocator> class VectorSet {
}
m_array = std::move(new_array);
m_elements.reserve(m_array.slots_usable());
}
void add_after_grow(uint index, ArrayType &new_array)