diff options
Diffstat (limited to 'src/gpu/GrProcessor.cpp')
-rw-r--r-- | src/gpu/GrProcessor.cpp | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp index 08f437d50a..3b8cb679fd 100644 --- a/src/gpu/GrProcessor.cpp +++ b/src/gpu/GrProcessor.cpp @@ -12,7 +12,7 @@ #include "GrInvariantOutput.h" #include "GrMemoryPool.h" #include "GrXferProcessor.h" -#include "SkTLS.h" +#include "SkMutex.h" #if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS @@ -96,24 +96,27 @@ const SkMatrix& TestMatrix(SkRandom* random) { } } -class GrProcessor_Globals { + +// We use a global pool protected by a mutex. Chrome may use the same GrContext on different +// threads. The GrContext is not used concurrently on different threads and there is a memory +// barrier between accesses of a context on different threads. Also, there may be multiple +// GrContexts and those contexts may be in use concurrently on different threads. +namespace { +SK_DECLARE_STATIC_MUTEX(gProcessorPoolMutex); +class MemoryPoolAccessor { public: - static GrMemoryPool* GetTLS() { - return (GrMemoryPool*)SkTLS::Get(CreateTLS, DeleteTLS); - } + MemoryPoolAccessor() { gProcessorPoolMutex.acquire(); } -private: - static void* CreateTLS() { - return SkNEW_ARGS(GrMemoryPool, (4096, 4096)); - } + ~MemoryPoolAccessor() { gProcessorPoolMutex.release(); } - static void DeleteTLS(void* pool) { - SkDELETE(reinterpret_cast<GrMemoryPool*>(pool)); + GrMemoryPool* pool() const { + static GrMemoryPool gPool(4096, 4096); + return &gPool; } }; +} -int32_t GrProcessor::gCurrProcessorClassID = - GrProcessor::kIllegalProcessorClassID; +int32_t GrProcessor::gCurrProcessorClassID = GrProcessor::kIllegalProcessorClassID; /////////////////////////////////////////////////////////////////////////////// @@ -125,11 +128,11 @@ void GrProcessor::addTextureAccess(const GrTextureAccess* access) { } void* GrProcessor::operator new(size_t size) { - return GrProcessor_Globals::GetTLS()->allocate(size); + return MemoryPoolAccessor().pool()->allocate(size); } void GrProcessor::operator delete(void* target) { - GrProcessor_Globals::GetTLS()->release(target); + return MemoryPoolAccessor().pool()->release(target); } bool GrProcessor::hasSameTextureAccesses(const GrProcessor& that) const { |