commit 8b2fac4b25dfb8180c54707f8e19698a9fddde07
author bsalomon <bsalomon@google.com> Thu Jun 19 14:13:45 2014 -0700
committer Commit bot <commit-bot@chromium.org> Thu Jun 19 14:13:45 2014 -0700
tree b427f96dfc4649b81ef9e4a5e1aaffcaecc092ab
parent 9efd66b8451f25465abd1027e09a3bcfa7b9c554

Cache the GrEffect used for text rendering in GrBitmapTextContext.

R=jvanverth@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/338093005

src/gpu/GrBitmapTextContext.cpp

diff --git a/src/gpu/GrBitmapTextContext.cpp b/src/gpu/GrBitmapTextContext.cpp
index 4f6a1af..25c13ec 100755
--- a/src/gpu/GrBitmapTextContext.cpp
+++ b/src/gpu/GrBitmapTextContext.cpp
@@ -56,6 +56,7 @@
 
     fCurrTexture = NULL;
     fCurrVertex = 0;
+    fEffectTextureGenID = 0;
 
     fVertices = NULL;
     fMaxVertices = 0;
@@ -93,12 +94,17 @@
         SkASSERT(fCurrTexture);
         GrTextureParams params(SkShader::kRepeat_TileMode, GrTextureParams::kNone_FilterMode);
 
+        uint32_t textureGenID = fCurrTexture->getGenerationID();
+        
+        if (textureGenID != fEffectTextureGenID) {
+            fCachedEffect.reset(GrCustomCoordsTextureEffect::Create(fCurrTexture, params));
+            fEffectTextureGenID = textureGenID;
+        }
+
         // This effect could be stored with one of the cache objects (atlas?)
         int coordsIdx = drawState->hasColorVertexAttribute() ? kGlyphCoordsWithColorAttributeIndex :
                                                                kGlyphCoordsNoColorAttributeIndex;
-        drawState->addCoverageEffect(
-                                GrCustomCoordsTextureEffect::Create(fCurrTexture, params),
-                                coordsIdx)->unref();
+        drawState->addCoverageEffect(fCachedEffect.get(), coordsIdx);
         SkASSERT(NULL != fStrike);
         switch (fStrike->getMaskFormat()) {
             // Color bitmap text

src/gpu/GrBitmapTextContext.h

diff --git a/src/gpu/GrBitmapTextContext.h b/src/gpu/GrBitmapTextContext.h
index 51193c8..836cc76 100644
--- a/src/gpu/GrBitmapTextContext.h
+++ b/src/gpu/GrBitmapTextContext.h
@@ -45,11 +45,13 @@
         kDefaultRequestedVerts   = kDefaultRequestedGlyphs * 4,
     };
 
-    void*                   fVertices;
-    int32_t                 fMaxVertices;
-    GrTexture*              fCurrTexture;
-    int                     fCurrVertex;
-    SkRect                  fVertexBounds;
+    void*                       fVertices;
+    int32_t                     fMaxVertices;
+    GrTexture*                  fCurrTexture;
+    SkAutoTUnref<GrEffectRef>   fCachedEffect;
+    uint32_t                    fEffectTextureGenID;
+    int                         fCurrVertex;
+    SkRect                      fVertexBounds;
 };
 
 #endif

src/gpu/GrCacheable.cpp

diff --git a/src/gpu/GrCacheable.cpp b/src/gpu/GrCacheable.cpp
new file mode 100644
index 0000000..120be78
--- /dev/null
+++ b/src/gpu/GrCacheable.cpp
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+
+#include "GrCacheable.h"
+
+uint32_t GrCacheable::getGenerationID() const {
+    static int32_t gPathRefGenerationID;
+    while (!fGenID) {
+        fGenID = static_cast<uint32_t>(sk_atomic_inc(&gPathRefGenerationID) + 1);
+    }
+    return fGenID;
+}