RPCS3/glslang
1
0
Fork 0
mirror of https://github.com/RPCS3/glslang.git synced 2024-10-07 08:33:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify PoolAlloc with use of thread_local.

Browse Source 
glslang is using C++ 11, which has first class support for variables of the `thread_local` storage class.

By dropping the use of the `OS_[GS]etTLSValue`, we can simplify the logic, and have it support a thread-local default allocator if none is provided.

Issue: #2346
This commit is contained in:
Ben Clayton 2020-07-14 18:32:12 +01:00
parent b99a6a7273
commit a3845240ae
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glslang/Include/InitializeGlobals.h
View File

@ -37,7 +37,7 @@
namespace glslang { namespace glslang {
bool InitializePoolIndex(); inline bool InitializePoolIndex() { return true; } // DEPRECATED: No need to call
} // end namespace glslang } // end namespace glslang

28
glslang/MachineIndependent/PoolAlloc.cpp
View File

@ -35,34 +35,28 @@
#include "../Include/Common.h" #include "../Include/Common.h"
#include "../Include/PoolAlloc.h" #include "../Include/PoolAlloc.h"
#include "../Include/InitializeGlobals.h"
#include "../OSDependent/osinclude.h"
namespace glslang { namespace glslang {
// Process-wide TLS index namespace {
OS_TLSIndex PoolIndex; thread_local TPoolAllocator* threadPoolAllocator = nullptr;
TPoolAllocator* GetDefaultThreadPoolAllocator()
{
thread_local TPoolAllocator defaultAllocator;
return &defaultAllocator;
}
} // anonymous namespace
// Return the thread-specific current pool. // Return the thread-specific current pool.
TPoolAllocator& GetThreadPoolAllocator() TPoolAllocator& GetThreadPoolAllocator()
{ {
return *static_cast<TPoolAllocator*>(OS_GetTLSValue(PoolIndex)); return *(threadPoolAllocator ? threadPoolAllocator : GetDefaultThreadPoolAllocator());
} }
// Set the thread-specific current pool. // Set the thread-specific current pool.
void SetThreadPoolAllocator(TPoolAllocator* poolAllocator) void SetThreadPoolAllocator(TPoolAllocator* poolAllocator)
{ {
OS_SetTLSValue(PoolIndex, poolAllocator); threadPoolAllocator = poolAllocator;
}
// Process-wide set up of the TLS pool storage.
bool InitializePoolIndex()
{
// Allocate a TLS index.
if ((PoolIndex = OS_AllocTLSIndex()) == OS_INVALID_TLS_INDEX)
return false;
return true;
} }
// //