Some cleanup in GrTextureProvider and GrResourceProvider

src/gpu/GrResourceProvider.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrResourceProvider.h"
 
 #include "GrGpu.h"
@@ skipping 10 matching lines @@
     fQuadIndexBufferKey = gQuadIndexBufferKey;
 }
 
 const GrIndexBuffer* GrResourceProvider::createInstancedIndexBuffer(const uint16_t* pattern,
                                                                     int patternSize,
                                                                     int reps,
                                                                     int vertCount,
                                                                     const GrUniqueKey& key) {
     size_t bufferSize = patternSize * reps * sizeof(uint16_t);
 
-    GrIndexBuffer* buffer = this->getIndexBuffer(bufferSize, /* dynamic = */ false, true);
+    // This is typically used in GrBatchs, so we assume kNoPendingIO.
+    GrIndexBuffer* buffer = this->createIndexBuffer(bufferSize, kStatic_BufferUsage,
+                                                    kNoPendingIO_Flag);
     if (!buffer) {
         return NULL;
     }
     uint16_t* data = (uint16_t*) buffer->map();
     bool useTempData = (NULL == data);
     if (useTempData) {
         data = SkNEW_ARRAY(uint16_t, reps * patternSize);
     }
     for (int i = 0; i < reps; ++i) {
         int baseIdx = i * patternSize;
@@ skipping 34 matching lines @@
     return this->gpu()->pathRendering()->createPathRange(gen, stroke);
 }
 
 GrPathRange* GrResourceProvider::createGlyphs(const SkTypeface* tf, const SkDescriptor* desc,
                                               const GrStrokeInfo& stroke) {
 
     SkASSERT(this->gpu()->pathRendering());
     return this->gpu()->pathRendering()->createGlyphs(tf, desc, stroke);
 }
 
-GrIndexBuffer* GrResourceProvider::getIndexBuffer(size_t size, bool dynamic,
-                                                  bool calledDuringFlush) {
+GrIndexBuffer* GrResourceProvider::createIndexBuffer(size_t size, BufferUsage usage,
+                                                     uint32_t flags) {
     if (this->isAbandoned()) {
         return NULL;
     }
 
+    bool noPendingIO = SkToBool(flags & kNoPendingIO_Flag);
+    bool dynamic = kDynamic_BufferUsage == usage;
     if (dynamic) {
         // bin by pow2 with a reasonable min
         static const uint32_t MIN_SIZE = 1 << 12;
         size = SkTMax(MIN_SIZE, GrNextPow2(SkToUInt(size)));
 
         GrScratchKey key;
-        GrIndexBuffer::ComputeScratchKey(size, dynamic, &key);
+        GrIndexBuffer::ComputeScratchKey(size, true, &key);
         uint32_t scratchFlags = 0;
-        if (calledDuringFlush) {
+        if (noPendingIO) {
             scratchFlags = GrResourceCache::kRequireNoPendingIO_ScratchFlag;
         } else {
             scratchFlags = GrResourceCache::kPreferNoPendingIO_ScratchFlag;
         }
         GrGpuResource* resource = this->cache()->findAndRefScratchResource(key, scratchFlags);
         if (resource) {
             return static_cast<GrIndexBuffer*>(resource);
         }
     }
-
-    return this->gpu()->createIndexBuffer(size, dynamic);    
+    return this->gpu()->createIndexBuffer(size, dynamic);
 }
 
-GrVertexBuffer* GrResourceProvider::getVertexBuffer(size_t size, bool dynamic, 
-                                                    bool calledDuringFlush) {
+GrVertexBuffer* GrResourceProvider::createVertexBuffer(size_t size, BufferUsage usage,
+                                                       uint32_t flags) {
     if (this->isAbandoned()) {
         return NULL;
     }
 
+    bool noPendingIO = SkToBool(flags & kNoPendingIO_Flag);
+    bool dynamic = kDynamic_BufferUsage == usage;
     if (dynamic) {
         // bin by pow2 with a reasonable min
-        static const uint32_t MIN_SIZE = 1 << 15;
+        static const uint32_t MIN_SIZE = 1 << 12;
         size = SkTMax(MIN_SIZE, GrNextPow2(SkToUInt(size)));
 
         GrScratchKey key;
-        GrVertexBuffer::ComputeScratchKey(size, dynamic, &key);
+        GrVertexBuffer::ComputeScratchKey(size, true, &key);
         uint32_t scratchFlags = 0;
-        if (calledDuringFlush) {
+        if (noPendingIO) {
             scratchFlags = GrResourceCache::kRequireNoPendingIO_ScratchFlag;
         } else {
             scratchFlags = GrResourceCache::kPreferNoPendingIO_ScratchFlag;
         }
         GrGpuResource* resource = this->cache()->findAndRefScratchResource(key, scratchFlags);
         if (resource) {
             return static_cast<GrVertexBuffer*>(resource);
         }
     }
-
     return this->gpu()->createVertexBuffer(size, dynamic);
 }