commit 03464f1920aa56854fdaa16fa8c87826147317e4
author Jim Van Verth <jvanverth@google.com> Mon Jun 03 11:09:40 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jun 03 16:32:07 2019 +0000
tree efe0176cfa114c8e584403675e39c3f8ab898f34
parent d7255a716e539f909e0f5c6ec9ea1625f47ada4e

Maybe don't use Metal's instanced methods if not supported.

Fixes exception on iPhone6 bots.

Bug: skia:9117
Change-Id: Iba8bbf6481ef641245c261b545813da722302abc
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/217498
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>

src/gpu/mtl/GrMtlGpuCommandBuffer.h

diff --git a/src/gpu/mtl/GrMtlGpuCommandBuffer.h b/src/gpu/mtl/GrMtlGpuCommandBuffer.h
index 6f85603..f7a0eb9 100644
--- a/src/gpu/mtl/GrMtlGpuCommandBuffer.h
+++ b/src/gpu/mtl/GrMtlGpuCommandBuffer.h
@@ -98,25 +98,18 @@
 
     MTLRenderPassDescriptor* createRenderPassDesc() const;
 
-    void bindGeometry(const GrBuffer* vertexBuffer, const GrBuffer* instanceBuffer);
+    void bindGeometry(const GrBuffer* vertexBuffer, size_t vertexOffset,
+                      const GrBuffer* instanceBuffer);
 
     // GrMesh::SendToGpuImpl methods. These issue the actual Metal draw commands.
     // Marked final as a hint to the compiler to not use virtual dispatch.
     void sendMeshToGpu(GrPrimitiveType primType, const GrBuffer* vertexBuffer, int vertexCount,
-                       int baseVertex) final {
-        this->sendInstancedMeshToGpu(primType, vertexBuffer, vertexCount, baseVertex, nullptr, 1,
-                                     0);
-    }
+                       int baseVertex) final;
 
     void sendIndexedMeshToGpu(GrPrimitiveType primType, const GrBuffer* indexBuffer, int indexCount,
                               int baseIndex, uint16_t /*minIndexValue*/, uint16_t /*maxIndexValue*/,
                               const GrBuffer* vertexBuffer, int baseVertex,
-                              GrPrimitiveRestart restart) final {
-        SkASSERT(restart == GrPrimitiveRestart::kNo);
-        this->sendIndexedInstancedMeshToGpu(primType, indexBuffer, indexCount, baseIndex,
-                                            vertexBuffer, baseVertex, nullptr, 1, 0,
-                                            GrPrimitiveRestart::kNo);
-    }
+                              GrPrimitiveRestart restart) final;
 
     void sendInstancedMeshToGpu(GrPrimitiveType, const GrBuffer* vertexBuffer, int vertexCount,
                                 int baseVertex, const GrBuffer* instanceBuffer, int instanceCount,
@@ -127,7 +120,8 @@
                                        const GrBuffer* instanceBuffer, int instanceCount,
                                        int baseInstance, GrPrimitiveRestart) final;
 
-    void setVertexBuffer(id<MTLRenderCommandEncoder>, const GrMtlBuffer*, size_t index);
+    void setVertexBuffer(id<MTLRenderCommandEncoder>, const GrMtlBuffer*, size_t offset,
+                         size_t index);
     void resetBufferBindings();
 
     GrMtlGpu*                                     fGpu;
@@ -143,6 +137,7 @@
 
     struct CommandBufferInfo {
         SkRect fBounds;
+        size_t fCurrentVertexStride;
     };
 
     CommandBufferInfo fCommandBufferInfo;