Isolate GrBufferAllocPools inside GrBatchTarget

src/gpu/GrBatchTarget.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 "GrBatchAtlas.h"
 #include "GrBufferAllocPool.h"
 #include "GrPendingProgramElement.h"
 #include "GrPipeline.h"
 #include "GrTRecorder.h"
 #include "GrVertices.h"
 
 /*
  * GrBatch instances use this object to allocate space for their geometry and to issue the draws
  * that render their batch.
  */
-
-class GrIndexBufferAllocPool;
-class GrVertexBufferAllocPool;
-
 class GrBatchTarget : public SkNoncopyable {
 public:
     typedef GrBatchAtlas::BatchToken BatchToken;
-    GrBatchTarget(GrGpu* gpu,
-                  GrVertexBufferAllocPool* vpool,
-                  GrIndexBufferAllocPool* ipool);
+    GrBatchTarget(GrGpu* gpu);
 
     void initDraw(const GrPrimitiveProcessor* primProc, const GrPipeline* pipeline) {
         GrNEW_APPEND_TO_RECORDER(fFlushBuffer, BufferedFlush, (primProc, pipeline));
         fNumberOfDraws++;
         fCurrentToken++;
     }
 
     class TextureUploader {
     public:
         TextureUploader(GrGpu* gpu) : fGpu(gpu) { SkASSERT(gpu); }
@@ skipping 45 matching lines @@
     }
 
     bool isIssued(BatchToken token) const { return fLastFlushedToken >= token; }
     BatchToken currentToken() const { return fCurrentToken; }
     BatchToken asapToken() const { return fLastFlushedToken + 1; }
 
     // TODO much of this complexity goes away when batch is everywhere
     void resetNumberOfDraws() { fNumberOfDraws = 0; }
     int numberOfDraws() const { return fNumberOfDraws; }
     void preFlush() {
+        this->unmap();
         int updateCount = fAsapUploads.count();
         for (int i = 0; i < updateCount; i++) {
             fAsapUploads[i]->upload(TextureUploader(fGpu));
         }
         fInlineUpdatesIndex = 0;
         fIter = FlushBuffer::Iter(fFlushBuffer);
     }
     void flushNext(int n);
     void postFlush() {
         SkASSERT(!fIter.next());
         fFlushBuffer.reset();
         fAsapUploads.reset();
         fInlineUploads.reset();
     }
 
     // TODO This goes away when everything uses batch
     GrBatchTracker* currentBatchTracker() {
         SkASSERT(!fFlushBuffer.empty());
         return &fFlushBuffer.back().fBatchTracker;
     }
 
     const GrDrawTargetCaps& caps() const { return *fGpu->caps(); }
 
-    GrVertexBufferAllocPool* vertexPool() { return fVertexPool; }
-    GrIndexBufferAllocPool* indexPool() { return fIndexPool; }
+    GrResourceProvider* resourceProvider() const { return fGpu->getContext()->resourceProvider(); }
 
-    GrResourceProvider* resourceProvider() const { return fGpu->getContext()->resourceProvider(); }
+    void* makeVertSpace(size_t vertexSize, int vertexCount,
+                        const GrVertexBuffer** buffer, int* startVertex);
+    uint16_t* makeIndexSpace(int indexCount,
+                             const GrIndexBuffer** buffer, int* startIndex);
 
     // A helper for draws which overallocate and then return data to the pool
     void putBackIndices(size_t indices) { fIndexPool->putBack(indices * sizeof(uint16_t)); }
 
     void putBackVertices(size_t vertices, size_t vertexStride) {
         fVertexPool->putBack(vertices * vertexStride);
     }
 
+    void unmap() {

[bsalomon, 2015/05/07 14:28:40]

Maybe a bit more descriptive name here? unmapBuffers()?
unmapVertexAndIndexBuffers()?

Also, wondering whether we want to expose these methods to GrBatchs.

[robertphillips, 2015/05/07 14:34:21]

Done-ish. unmap has been renamed and made private. reset needs to be accessible
for GrTargetCommands::reset to call.

+        fVertexPool->unmap();
+        fIndexPool->unmap();
+    }
+
+    void reset() {
+        fVertexPool->reset();
+        fIndexPool->reset();    
+    }
+
 private:
     GrGpu* fGpu;
-    GrVertexBufferAllocPool* fVertexPool;
-    GrIndexBufferAllocPool* fIndexPool;
+    SkAutoTDelete<GrVertexBufferAllocPool> fVertexPool;
+    SkAutoTDelete<GrIndexBufferAllocPool> fIndexPool;
 
     typedef void* TBufferAlign; // This wouldn't be enough align if a command used long double.
 
     struct BufferedFlush {
         BufferedFlush(const GrPrimitiveProcessor* primProc, const GrPipeline* pipeline)
             : fPrimitiveProcessor(primProc)
             , fPipeline(pipeline) {}
         typedef GrPendingProgramElement<const GrPrimitiveProcessor> ProgramPrimitiveProcessor;
         ProgramPrimitiveProcessor fPrimitiveProcessor;
         const GrPipeline* fPipeline;
@@ skipping 12 matching lines @@
     FlushBuffer::Iter fIter;
     int fNumberOfDraws;
     BatchToken fCurrentToken;
     BatchToken fLastFlushedToken; // The next token to be flushed
     SkTArray<SkAutoTUnref<Uploader>, true> fAsapUploads;
     SkTArray<SkAutoTUnref<Uploader>, true> fInlineUploads;
     int fInlineUpdatesIndex;
 };
 
 #endif