Remove batchtracker

src/gpu/effects/GrBitmapTextGeoProc.cpp

Index: src/gpu/effects/GrBitmapTextGeoProc.cpp
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp
index 69c2029edbd4eec98b627ff29bbc283b9edbe0f7..657080e4b30ce3a843c4c83ce4d7676a04c2cf12 100644
--- a/src/gpu/effects/GrBitmapTextGeoProc.cpp
+++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp
@@ -15,7 +15,7 @@
 
 class GrGLBitmapTextGeoProc : public GrGLGeometryProcessor {
 public:
-    GrGLBitmapTextGeoProc(const GrGeometryProcessor&, const GrBatchTracker&)
+    GrGLBitmapTextGeoProc()

[bsalomon, 2015/09/10 18:55:31]

one line?

[joshualitt, 2015/09/10 20:08:05]

Acknowledged.

         : fColor(GrColor_ILLEGAL) {}
 
     void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override{
@@ -74,8 +74,7 @@ public:
     }
 
     virtual void setData(const GrGLProgramDataManager& pdman,
-                         const GrPrimitiveProcessor& gp,
-                         const GrBatchTracker& bt) override {
+                         const GrPrimitiveProcessor& gp) override {
         const GrBitmapTextGeoProc& btgp = gp.cast<GrBitmapTextGeoProc>();
         if (btgp.color() != fColor && !btgp.hasVertexColor()) {
             GrGLfloat c[4];
@@ -93,7 +92,6 @@ public:
     }
 
     static inline void GenKey(const GrGeometryProcessor& proc,
-                              const GrBatchTracker& bt,
                               const GrGLSLCaps&,
                               GrProcessorKeyBuilder* b) {
         const GrBitmapTextGeoProc& gp = proc.cast<GrBitmapTextGeoProc>();
@@ -143,16 +141,14 @@ GrBitmapTextGeoProc::GrBitmapTextGeoProc(GrColor color, GrTexture* texture,
     this->addTextureAccess(&fTextureAccess);
 }
 
-void GrBitmapTextGeoProc::getGLProcessorKey(const GrBatchTracker& bt,
-                                            const GrGLSLCaps& caps,
+void GrBitmapTextGeoProc::getGLProcessorKey(const GrGLSLCaps& caps,

[bsalomon, 2015/09/10 18:55:31]

one line?

[joshualitt, 2015/09/10 20:08:05]

Acknowledged.

                                             GrProcessorKeyBuilder* b) const {
-    GrGLBitmapTextGeoProc::GenKey(*this, bt, caps, b);
+    GrGLBitmapTextGeoProc::GenKey(*this, caps, b);
 }
 
 GrGLPrimitiveProcessor*
-GrBitmapTextGeoProc::createGLInstance(const GrBatchTracker& bt,
-                                      const GrGLSLCaps& caps) const {
-    return new GrGLBitmapTextGeoProc(*this, bt);
+GrBitmapTextGeoProc::createGLInstance(const GrGLSLCaps& caps) const {

[bsalomon, 2015/09/10 18:55:31]

one line?

[joshualitt, 2015/09/10 20:08:05]

Acknowledged.

+    return new GrGLBitmapTextGeoProc();
 }
 
 ///////////////////////////////////////////////////////////////////////////////