Refugee from Dead Machine 4: MDB Monster

src/gpu/GrBatchFlushState.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrBatchBuffer_DEFINED
 #define GrBatchBuffer_DEFINED
 
 #include "GrBufferAllocPool.h"
 #include "batches/GrVertexBatch.h"
+#include "GrContext.h"
 
 class GrResourceProvider;
 
 /** Simple class that performs the upload on behalf of a GrBatchUploader. */
 class GrBatchUploader::TextureUploader {
 public:
     TextureUploader(GrGpu* gpu) : fGpu(gpu) { SkASSERT(gpu); }
 
     /**
         * Updates the pixels in a rectangle of a texture.
@@ skipping 36 matching lines @@
     }
 
     const GrCaps& caps() const { return *fGpu->caps(); }
     GrResourceProvider* resourceProvider() const { return fResourceProvider; }
 
     /** Has the token been flushed to the backend 3D API. */
     bool hasTokenBeenFlushed(GrBatchToken token) const { return fLastFlushedToken >= token; }
 
     /** The current token advances once for every contiguous set of uninterrupted draws prepared
         by a batch. */
-    GrBatchToken currentToken() const { return fCurrentToken; }
+    GrBatchToken currentToken2() const { return fCurrentToken; }
 
     /** The last token flushed to all the way to the backend API. */
     GrBatchToken lastFlushedToken() const { return fLastFlushedToken; }
 
     /** This is a magic token that can be used to indicate that an upload should occur before
         any draws for any batch in the current flush execute. */
     GrBatchToken asapToken() const { return fLastFlushedToken + 1; }
 
     void* makeVertexSpace(size_t vertexSize, int vertexCount,
                           const GrVertexBuffer** buffer, int* startVertex);
@@ skipping 52 matching lines @@
         if (this->asapToken() == upload->lastUploadToken()) {
             fState->addASAPUpload(upload);
         } else {
             fBatch->fInlineUploads.push_back().reset(SkRef(upload));
         }
     }
 
     bool hasTokenBeenFlushed(GrBatchToken token) const {
         return fState->hasTokenBeenFlushed(token);
     }
-    GrBatchToken currentToken() const { return fState->currentToken(); }
+    GrBatchToken currentToken1() const { return fState->currentToken2(); }
     GrBatchToken asapToken() const { return fState->asapToken(); }
 
     const GrCaps& caps() const { return fState->caps(); }
 
     GrResourceProvider* resourceProvider() const { return fState->resourceProvider(); }
 
 protected:
     GrDrawBatch* batch() { return fBatch; }
     GrBatchFlushState* state() { return fState; }
 
@@ skipping 32 matching lines @@
     void putBackVertices(int vertices, size_t vertexStride) {
         this->state()->putBackVertexSpace(vertices * vertexStride);
     }
 
 private:
     GrVertexBatch* vertexBatch() { return static_cast<GrVertexBatch*>(this->batch()); }
     typedef GrDrawBatch::Target INHERITED;
 };
 
 #endif