mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-03 17:39:42 +00:00
Code Issues Releases Wiki Activity

Add align implementation

Browse source
This commit is contained in:
elsid 2018-11-04 21:23:30 +03:00
parent b477775e16
commit d2c2bdadb5
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
components/detournavigator/recastallocutils.hpp
View file

@ -85,6 +85,18 @@ namespace DetourNavigator
{ {
return static_cast<std::size_t*>(ptr) + 1; return static_cast<std::size_t*>(ptr) + 1;
} }
// TODO: use std::align
inline void* align(std::size_t align, std::size_t size, void*& ptr, std::size_t& space) noexcept
{
const auto intptr = reinterpret_cast<std::uintptr_t>(ptr);
const auto aligned = (intptr - 1u + align) & - align;
const auto diff = aligned - intptr;
if ((size + diff) > space)
return nullptr;
space -= diff;
return ptr = reinterpret_cast<void*>(aligned);
}
} }
#endif #endif

2
components/detournavigator/recasttempallocator.hpp
View file

@ -21,7 +21,7 @@ namespace DetourNavigator
std::size_t space = mStack.size() - getUsedSize(); std::size_t space = mStack.size() - getUsedSize();
void* top = mTop; void* top = mTop;
const auto itemSize = 2 * sizeof(std::size_t) + size; const auto itemSize = 2 * sizeof(std::size_t) + size;
if (rcUnlikely(!std::align(sizeof(std::size_t), itemSize, top, space))) if (rcUnlikely(!align(sizeof(std::size_t), itemSize, top, space)))
return nullptr; return nullptr;
setTempPtrBufferType(top, BufferType_temp); setTempPtrBufferType(top, BufferType_temp);
setTempPtrPrev(top, mPrev); setTempPtrPrev(top, mPrev);