Add resource provider flag to avoid client-side buffers

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 "GrBuffer.h"
@@ skipping 82 matching lines @@
 
 GrBuffer* GrResourceProvider::createBuffer(size_t size, GrBufferType intendedType,
                                            GrAccessPattern accessPattern, uint32_t flags,
                                            const void* data) {
     if (this->isAbandoned()) {
         return nullptr;
     }
     if (kDynamic_GrAccessPattern != accessPattern) {
         return this->gpu()->createBuffer(size, intendedType, accessPattern, data);
     }
+    if (!(flags & kRequireGpuMemory_Flag) &&
+        this->gpu()->caps()->preferClientSideDynamicBuffers() &&
+        GrBufferTypeIsVertexOrIndex(intendedType) &&
+        kDynamic_GrAccessPattern == accessPattern) {
+        return GrBuffer::CreateCPUBacked(this->gpu(), size, intendedType, data);
+    }
 
     // bin by pow2 with a reasonable min
     static const uint32_t MIN_SIZE = 1 << 12;
     size_t allocSize = SkTMax(MIN_SIZE, GrNextPow2(SkToUInt(size)));
 
     GrScratchKey key;
-    GrBuffer::ComputeScratchKeyForDynamicBuffer(allocSize, intendedType, &key);
+    GrBuffer::ComputeScratchKeyForDynamicVBO(allocSize, intendedType, &key);
     uint32_t scratchFlags = 0;
     if (flags & kNoPendingIO_Flag) {
         scratchFlags = GrResourceCache::kRequireNoPendingIO_ScratchFlag;
     } else {
         scratchFlags = GrResourceCache::kPreferNoPendingIO_ScratchFlag;
     }
     GrBuffer* buffer = static_cast<GrBuffer*>(
         this->cache()->findAndRefScratchResource(key, allocSize, scratchFlags));
     if (!buffer) {
         buffer = this->gpu()->createBuffer(allocSize, intendedType, kDynamic_GrAccessPattern);
         if (!buffer) {
             return nullptr;
         }
     }
     if (data) {
         buffer->updateData(data, size);
     }
+    SkASSERT(!buffer->isCPUBacked()); // We should only cache real VBOs.
     return buffer;
 }
 
 GrBatchAtlas* GrResourceProvider::createAtlas(GrPixelConfig config,
                                               int width, int height,
                                               int numPlotsX, int numPlotsY,
                                               GrBatchAtlas::EvictionFunc func, void* data) {
     GrSurfaceDesc desc;
     desc.fFlags = kNone_GrSurfaceFlags;
     desc.fWidth = width;
@@ skipping 60 matching lines @@
     return rt->renderTargetPriv().getStencilAttachment();
 }
 
 GrRenderTarget* GrResourceProvider::wrapBackendTextureAsRenderTarget(
         const GrBackendTextureDesc& desc) {
     if (this->isAbandoned()) {
         return nullptr;
     }
     return this->gpu()->wrapBackendTextureAsRenderTarget(desc);
 }