AuroraMiddleware/AuroraOpenALSoft
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove the DEF_ALIGN macro

Browse Source
This commit is contained in:
Chris Robinson 2019-06-06 00:37:00 -07:00
parent a7be531049
commit 585b0cf3be
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Alc/vector.h
View File

@ -7,7 +7,7 @@
namespace al {
template<typename T, size_t alignment=DEF_ALIGN>
template<typename T, size_t alignment=alignof(T)>
using vector = std::vector<T, al::allocator<T, alignment>>;
} // namespace al

8
OpenAL32/alSource.cpp
View File

@ -1284,7 +1284,7 @@ ALboolean SetSourceiv(ALsource *Source, ALCcontext *Context, SourceProp prop, co
if(buffer != nullptr)
{
/* Add the selected buffer to a one-item queue */
auto newlist = static_cast<ALbufferlistitem*>(al_calloc(DEF_ALIGN,
auto newlist = static_cast<ALbufferlistitem*>(al_calloc(alignof(void*),
ALbufferlistitem::Sizeof(1u)));
newlist->next.store(nullptr, std::memory_order_relaxed);
newlist->max_samples = buffer->SampleLen;
@ -3185,13 +3185,13 @@ START_API_FUNC
if(!BufferListStart)
{
BufferListStart = static_cast<ALbufferlistitem*>(al_calloc(DEF_ALIGN,
BufferListStart = static_cast<ALbufferlistitem*>(al_calloc(alignof(void*),
ALbufferlistitem::Sizeof(1u)));
BufferList = BufferListStart;
}
else
{
auto item = static_cast<ALbufferlistitem*>(al_calloc(DEF_ALIGN,
auto item = static_cast<ALbufferlistitem*>(al_calloc(alignof(void*),
ALbufferlistitem::Sizeof(1u)));
BufferList->next.store(item, std::memory_order_relaxed);
BufferList = item;
@ -3290,7 +3290,7 @@ START_API_FUNC
}
std::unique_lock<std::mutex> buflock{device->BufferLock};
auto BufferListStart = static_cast<ALbufferlistitem*>(al_calloc(DEF_ALIGN,
auto BufferListStart = static_cast<ALbufferlistitem*>(al_calloc(alignof(void*),
ALbufferlistitem::Sizeof(nb)));
BufferList = BufferListStart;
BufferList->next.store(nullptr, std::memory_order_relaxed);

7
common/almalloc.cpp
View File

@ -4,6 +4,7 @@
#include "almalloc.h"
#include <cassert>
#include <cstddef>
#include <cstdlib>
#include <cstring>
#ifdef HAVE_MALLOC_H
@ -28,7 +29,7 @@
void *al_malloc(size_t alignment, size_t size)
{
assert((alignment & (alignment-1)) == 0);
alignment = std::max(alignment, sizeof(void*));
alignment = std::max(alignment, alignof(std::max_align_t));
#if defined(HAVE_ALIGNED_ALLOC)
size = (size+(alignment-1))&~(alignment-1);
@ -79,7 +80,7 @@ void al_free(void *ptr) noexcept
size_t al_get_page_size() noexcept
{
static size_t psize = 0;
static size_t psize{0u};
if(UNLIKELY(!psize))
{
#ifdef HAVE_SYSCONF
@ -97,7 +98,7 @@ size_t al_get_page_size() noexcept
psize = sysinfo.dwPageSize;
}
#endif
if(!psize) psize = DEF_ALIGN;
if(!psize) psize = alignof(std::max_align_t);
}
return psize;
}

2
common/almalloc.h
View File

@ -7,8 +7,6 @@
#include <limits>
#include <algorithm>
/* Minimum alignment required by posix_memalign. */
#define DEF_ALIGN sizeof(void*)
void *al_malloc(size_t alignment, size_t size);
void *al_calloc(size_t alignment, size_t size);