rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-01-31 14:52:11 +01:00
Code Issues Projects Releases Wiki Activity

[util] Fix small_vector move constructor

Browse Source
This commit is contained in:
Robin Kertels 2024-09-19 19:54:15 +02:00 committed by Philip Rebohle
parent 398c198df6
commit 2f9ce66879
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/util/util_small_vector.h
View File

@ -33,12 +33,36 @@ namespace dxvk {
}; };
small_vector(small_vector&& other) { small_vector(small_vector&& other) {
if (other.m_capacity == N) { if (other.m_size < N) {
for (size_t i = 0; i < other.m_size; i++) { for (size_t i = 0; i < other.m_size; i++) {
u.m_data[i] = std::move(other.u.m_data[i]); new (&u.m_data[i]) T(std::move(*other.ptr(i)));
} }
} else { } else {
u.m_ptr = other.u.m_ptr; u.m_ptr = other.u.m_ptr;
m_capacity = other.m_capacity;
other.u.m_ptr = nullptr;
other.m_capacity = N;
}
m_size = other.m_size;
other.m_size = 0;
}
small_vector& operator = (small_vector&& other) {
for (size_t i = 0; i < m_size; i++)
ptr(i)->~T();
if (m_capacity > N)
delete[] u.m_ptr;
if (other.m_size < N) {
m_capacity = N;
for (size_t i = 0; i < other.m_size; i++) {
new (&u.m_data[i]) T(std::move(*other.ptr(i)));
}
} else {
u.m_ptr = other.u.m_ptr;
m_capacity = other.m_capacity;
other.u.m_ptr = nullptr;
other.m_capacity = N; other.m_capacity = N;
} }
m_size = other.m_size; m_size = other.m_size;