|
@@ -29,7 +29,7 @@ namespace bs
|
|
|
#if BS_DEBUG_MODE
|
|
#if BS_DEBUG_MODE
|
|
|
FrameAlloc::FrameAlloc(UINT32 blockSize)
|
|
FrameAlloc::FrameAlloc(UINT32 blockSize)
|
|
|
:mBlockSize(blockSize), mFreeBlock(nullptr), mNextBlockIdx(0), mTotalAllocBytes(0),
|
|
:mBlockSize(blockSize), mFreeBlock(nullptr), mNextBlockIdx(0), mTotalAllocBytes(0),
|
|
|
- mLastFrame(nullptr), mOwnerThread(BS_THREAD_CURRENT_ID)
|
|
|
|
|
|
|
+ mLastFrame(nullptr)
|
|
|
{
|
|
{
|
|
|
}
|
|
}
|
|
|
#else
|
|
#else
|
|
@@ -48,8 +48,6 @@ namespace bs
|
|
|
UINT8* FrameAlloc::alloc(UINT32 amount)
|
|
UINT8* FrameAlloc::alloc(UINT32 amount)
|
|
|
{
|
|
{
|
|
|
#if BS_DEBUG_MODE
|
|
#if BS_DEBUG_MODE
|
|
|
- assert(mOwnerThread == BS_THREAD_CURRENT_ID && "Frame allocator called from invalid thread.");
|
|
|
|
|
-
|
|
|
|
|
amount += sizeof(UINT32);
|
|
amount += sizeof(UINT32);
|
|
|
#endif
|
|
#endif
|
|
|
UINT32 freeMem = 0;
|
|
UINT32 freeMem = 0;
|
|
@@ -76,8 +74,6 @@ namespace bs
|
|
|
UINT8* FrameAlloc::allocAligned(UINT32 amount, UINT32 alignment)
|
|
UINT8* FrameAlloc::allocAligned(UINT32 amount, UINT32 alignment)
|
|
|
{
|
|
{
|
|
|
#if BS_DEBUG_MODE
|
|
#if BS_DEBUG_MODE
|
|
|
- assert(mOwnerThread == BS_THREAD_CURRENT_ID && "Frame allocator called from invalid thread.");
|
|
|
|
|
-
|
|
|
|
|
amount += sizeof(UINT32);
|
|
amount += sizeof(UINT32);
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
@@ -148,10 +144,6 @@ namespace bs
|
|
|
|
|
|
|
|
void FrameAlloc::clear()
|
|
void FrameAlloc::clear()
|
|
|
{
|
|
{
|
|
|
-#if BS_DEBUG_MODE
|
|
|
|
|
- assert(mOwnerThread == BS_THREAD_CURRENT_ID && "Frame allocator called from invalid thread.");
|
|
|
|
|
-#endif
|
|
|
|
|
-
|
|
|
|
|
if(mLastFrame != nullptr)
|
|
if(mLastFrame != nullptr)
|
|
|
{
|
|
{
|
|
|
assert(mBlocks.size() > 0 && mNextBlockIdx > 0);
|
|
assert(mBlocks.size() > 0 && mNextBlockIdx > 0);
|
|
@@ -298,9 +290,6 @@ namespace bs
|
|
|
|
|
|
|
|
void FrameAlloc::setOwnerThread(ThreadId thread)
|
|
void FrameAlloc::setOwnerThread(ThreadId thread)
|
|
|
{
|
|
{
|
|
|
-#if BS_DEBUG_MODE
|
|
|
|
|
- mOwnerThread = thread;
|
|
|
|
|
-#endif
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
BS_THREADLOCAL FrameAlloc* _GlobalFrameAlloc = nullptr;
|
|
BS_THREADLOCAL FrameAlloc* _GlobalFrameAlloc = nullptr;
|