Improve nvpr glyph batching

src/gpu/GrStencilAndCoverTextContext.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrStencilAndCoverTextContext_DEFINED
 #define GrStencilAndCoverTextContext_DEFINED
 
 #include "GrTextContext.h"
 #include "GrDrawTarget.h"
 #include "GrStrokeInfo.h"
 #include "SkTHash.h"
 #include "SkTInternalLList.h"
 #include "SkTLList.h"
+#include "batches/GrDrawPathBatch.h"
 
 class GrTextStrike;
 class GrPath;
 class SkSurfaceProps;
-class GrPathRangeDraw;
 
 /*
  * This class implements text rendering using stencil and cover path rendering
  * (by the means of GrDrawTarget::drawPath).
  * This class exposes the functionality through GrTextContext interface.
  */
 class GrStencilAndCoverTextContext : public GrTextContext {
 public:
     static GrStencilAndCoverTextContext* Create(GrContext*, const SkSurfaceProps&);
 
@@ skipping 36 matching lines @@
 
         void draw(GrContext*, GrDrawContext*, GrPipelineBuilder*, GrColor, const SkMatrix&,
                   SkScalar x, SkScalar y, const SkIRect& clipBounds,
                   GrTextContext* fallbackTextContext, const SkPaint& originalSkPaint) const;
 
         void releaseGlyphCache() const;
 
         size_t computeSizeInCache() const;
 
     private:
+        typedef GrDrawPathRangeBatch::InstanceData InstanceData;
+
         SkGlyphCache* getGlyphCache() const;
         GrPathRange* createGlyphs(GrContext*) const;
         void appendGlyph(const SkGlyph&, const SkPoint&, FallbackBlobBuilder*);
 
         GrStrokeInfo                     fStroke;
         SkPaint                          fFont;
         SkScalar                         fTextRatio;
         float                            fTextInverseRatio;
         bool                             fUsingRawGlyphPaths;
         GrUniqueKey                      fGlyphPathsKey;
         int                              fTotalGlyphCount;
-        SkAutoTUnref<GrPathRangeDraw>    fDraw;
+        SkAutoTUnref<InstanceData>       fInstanceData;
+        int                              fFallbackGlyphCount;
         SkAutoTUnref<const SkTextBlob>   fFallbackTextBlob;
         mutable SkGlyphCache*            fDetachedGlyphCache;
         mutable uint32_t                 fLastDrawnGlyphsID;
-        mutable SkMatrix                 fLocalMatrixTemplate;
     };
 
     // Text blobs/caches.
 
     class TextBlob : public SkTLList<TextRun, 1> {
     public:
         typedef SkTArray<uint32_t, true> Key;
 
         static const Key& GetKey(const TextBlob* blob) { return blob->key(); }
 
@@ skipping 30 matching lines @@
 
     SkTHashMap<uint32_t, TextBlob*>                           fBlobIdCache;
     SkTHashTable<TextBlob*, const TextBlob::Key&, TextBlob>   fBlobKeyCache;
     SkTInternalLList<TextBlob>                                fLRUList;
     size_t                                                    fCacheSize;
 
     typedef GrTextContext INHERITED;
 };
 
 #endif