Use global GrMemoryPools protected by mutex for GrProcessor/GrBatch

src/gpu/GrProcessor.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrProcessor.h"
 #include "GrContext.h"
 #include "GrCoordTransform.h"
 #include "GrGeometryProcessor.h"
 #include "GrInvariantOutput.h"
 #include "GrMemoryPool.h"
 #include "GrXferProcessor.h"
-#include "SkTLS.h"
+#include "SkMutex.h"
 
 #if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
 
 class GrFragmentProcessor;
 class GrGeometryProcessor;
 
 /*
  * Originally these were both in the processor unit test header, but then it seemed to cause linker
  * problems on android.
  */
@@ skipping 63 matching lines @@
         gMatrices[3].postScale(SkIntToScalar(2), SK_ScalarHalf);
         gMatrices[4].setRotate(SkIntToScalar(215));
         gMatrices[4].set(SkMatrix::kMPersp0, 0.00013f);
         gMatrices[4].set(SkMatrix::kMPersp1, -0.000039f);
         gOnce = true;
     }
     return gMatrices[random->nextULessThan(static_cast<uint32_t>(SK_ARRAY_COUNT(gMatrices)))];
 }
 }
 
-class GrProcessor_Globals {
+
+namespace {
+SK_DECLARE_STATIC_MUTEX(gProcessorPoolMutex);
+class MemoryPoolAccessor {
 public:
-    static GrMemoryPool* GetTLS() {
-        return (GrMemoryPool*)SkTLS::Get(CreateTLS, DeleteTLS);
+    MemoryPoolAccessor() {
+        gProcessorPoolMutex.acquire();
+        static SkAutoTDelete<GrMemoryPool> gPool(SkNEW_ARGS(GrMemoryPool, (4096, 4096)));
+        fPool = gPool;
     }
 
+    ~MemoryPoolAccessor() { gProcessorPoolMutex.release(); }
+
+    GrMemoryPool* pool() const { return fPool; }
+
 private:
-    static void* CreateTLS() {
-        return SkNEW_ARGS(GrMemoryPool, (4096, 4096));
-    }
+    GrMemoryPool* fPool;
 
-    static void DeleteTLS(void* pool) {
-        SkDELETE(reinterpret_cast<GrMemoryPool*>(pool));
-    }
 };
+}
 
-int32_t GrProcessor::gCurrProcessorClassID =
-        GrProcessor::kIllegalProcessorClassID;
+int32_t GrProcessor::gCurrProcessorClassID = GrProcessor::kIllegalProcessorClassID;
 
 ///////////////////////////////////////////////////////////////////////////////
 
 GrProcessor::~GrProcessor() {}
 
 void GrProcessor::addTextureAccess(const GrTextureAccess* access) {
     fTextureAccesses.push_back(access);
     this->addGpuResource(access->getProgramTexture());
 }
 
 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 {
     if (this->numTextures() != that.numTextures()) {
         return false;
     }
     for (int i = 0; i < this->numTextures(); ++i) {
         if (this->textureAccess(i) != that.textureAccess(i)) {
             return false;
         }
@@ skipping 24 matching lines @@
 
 void GrFragmentProcessor::computeInvariantOutput(GrInvariantOutput* inout) const {
     this->onComputeInvariantOutput(inout);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // Initial static variable from GrXPFactory
 int32_t GrXPFactory::gCurrXPFClassID =
         GrXPFactory::kIllegalXPFClassID;