Revert of Consolidate GPU buffer implementations

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
 
@@ skipping 58 matching lines @@
     GrBatchToken currentToken() 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 GrBuffer** buffer, int* startVertex);
-    uint16_t* makeIndexSpace(int indexCount, const GrBuffer** buffer, int* startIndex);
+                          const GrVertexBuffer** buffer, int* startVertex);
+    uint16_t* makeIndexSpace(int indexCount, const GrIndexBuffer** buffer, int* startIndex);
 
     /** This is called after each batch has a chance to prepare its draws and before the draws
         are issued. */
     void preIssueDraws() {
         fVertexPool.unmap();
         fIndexPool.unmap();
         int uploadCount = fAsapUploads.count();
         for (int i = 0; i < uploadCount; i++) {
             fAsapUploads[i]->upload(&fUploader);
         }
@@ skipping 74 matching lines @@
         GrVertexBatch::DrawArray* draws = this->vertexBatch()->fDrawArrays.addToTail();
         draws->fPrimitiveProcessor.reset(primProc);
         this->state()->advanceToken();
     }
 
     void draw(const GrMesh& mesh) {
         this->vertexBatch()->fDrawArrays.tail()->fDraws.push_back(mesh);
     }
 
     void* makeVertexSpace(size_t vertexSize, int vertexCount,
-                          const GrBuffer** buffer, int* startVertex) {
+                          const GrVertexBuffer** buffer, int* startVertex) {
         return this->state()->makeVertexSpace(vertexSize, vertexCount, buffer, startVertex);
     }
 
-    uint16_t* makeIndexSpace(int indexCount, const GrBuffer** buffer, int* startIndex) {
+    uint16_t* makeIndexSpace(int indexCount, const GrIndexBuffer** buffer, int* startIndex) {
         return this->state()->makeIndexSpace(indexCount, buffer, startIndex);
     }
 
     /** Helpers for batches which over-allocate and then return data to the pool. */
     void putBackIndices(int indices) { this->state()->putBackIndices(indices); }
     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