Add resource provider flag to avoid client-side buffers

src/gpu/instanced/GLInstancedRendering.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GLInstancedRendering.h"
 
 #include "GrResourceProvider.h"
@@ skipping 78 matching lines @@
 
     // Lazily create a vertex array object.
     if (!fVertexArrayID) {
         GL_CALL(GenVertexArrays(1, &fVertexArrayID));
         if (!fVertexArrayID) {
             return;
         }
         this->glGpu()->bindVertexArray(fVertexArrayID);
 
         // Attach our index buffer to the vertex array.
+        SkASSERT(!this->indexBuffer()->isCPUBacked());
         GL_CALL(BindBuffer(GR_GL_ELEMENT_ARRAY_BUFFER,
                            static_cast<const GrGLBuffer*>(this->indexBuffer())->bufferID()));
 
         // Set up the non-instanced attribs.
-        this->glGpu()->bindBuffer(kVertex_GrBufferType,
-                                  static_cast<const GrGLBuffer*>(this->vertexBuffer()));
+        this->glGpu()->bindBuffer(kVertex_GrBufferType, this->vertexBuffer());
         GL_CALL(EnableVertexAttribArray((int)Attrib::kShapeCoords));
         GL_CALL(VertexAttribPointer((int)Attrib::kShapeCoords, 2, GR_GL_FLOAT, GR_GL_FALSE,
                                     sizeof(ShapeVertex), (void*) offsetof(ShapeVertex, fX)));
         GL_CALL(EnableVertexAttribArray((int)Attrib::kVertexAttrs));
         GL_CALL(VertexAttribIPointer((int)Attrib::kVertexAttrs, 1, GR_GL_INT, sizeof(ShapeVertex),
                                      (void*) offsetof(ShapeVertex, fAttrs)));
 
         SkASSERT(SK_InvalidUniqueID == fInstanceAttribsBufferUniqueId);
     }
 
     // Create and map instance and draw-indirect buffers.
     SkASSERT(!fInstanceBuffer);
-    fInstanceBuffer.reset(static_cast<GrGLBuffer*>(
+    fInstanceBuffer.reset(
         rp->createBuffer(sizeof(Instance) * numGLInstances, kVertex_GrBufferType,
-                         kDynamic_GrAccessPattern, GrResourceProvider::kNoPendingIO_Flag)));
+                         kDynamic_GrAccessPattern,
+                         GrResourceProvider::kNoPendingIO_Flag |
+                         GrResourceProvider::kRequireGpuMemory_Flag));
     if (!fInstanceBuffer) {
         return;
     }
 
     SkASSERT(!fDrawIndirectBuffer);
-    fDrawIndirectBuffer.reset(static_cast<GrGLBuffer*>(
+    fDrawIndirectBuffer.reset(
         rp->createBuffer(sizeof(GrGLDrawElementsIndirectCommand) * numGLDrawCmds,
                          kDrawIndirect_GrBufferType, kDynamic_GrAccessPattern,
-                         GrResourceProvider::kNoPendingIO_Flag)));
+                         GrResourceProvider::kNoPendingIO_Flag |
+                         GrResourceProvider::kRequireGpuMemory_Flag));
     if (!fDrawIndirectBuffer) {
         return;
     }
 
     Instance* glMappedInstances = static_cast<Instance*>(fInstanceBuffer->map());
     int glInstancesIdx = 0;
 
     auto* glMappedCmds = static_cast<GrGLDrawElementsIndirectCommand*>(fDrawIndirectBuffer->map());
     int glDrawCmdsIdx = 0;
 
@@ skipping 153 matching lines @@
         GL_CALL(DeleteVertexArrays(1, &fVertexArrayID));
         this->glGpu()->notifyVertexArrayDelete(fVertexArrayID);
     }
     fVertexArrayID = 0;
     fInstanceBuffer.reset();
     fDrawIndirectBuffer.reset();
     fInstanceAttribsBufferUniqueId = SK_InvalidUniqueID;
 }
 
 }