commit 3193a04b09d8a4b3ff6cf9468b2fddbe91a993ed
author Brian Osman <brianosman@google.com> Thu May 13 16:08:44 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu May 13 21:52:51 2021 +0000
tree 5992af198a5a282bf5bbf7b593aa64f5910f974d
parent 1a183bc90d7f2b6444d15389d39eefe565afafa9

Handle null vertex buffers in Metal

When using instanced rendering, we sometimes bind a null vertex
buffer. Make sure not to crash during the deferred bind.

Change-Id: Ia0351222a220c2ac947de52e9d6eb76146dd64b1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/408357
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/gpu/mtl/GrMtlOpsRenderPass.mm

diff --git a/src/gpu/mtl/GrMtlOpsRenderPass.mm b/src/gpu/mtl/GrMtlOpsRenderPass.mm
index 3098f53..b921e2f 100644
--- a/src/gpu/mtl/GrMtlOpsRenderPass.mm
+++ b/src/gpu/mtl/GrMtlOpsRenderPass.mm
@@ -416,6 +416,10 @@
                                          const GrBuffer* buffer,
                                          size_t vertexOffset,
                                          size_t inputBufferIndex) {
+    if (!buffer) {
+        return;
+    }
+
     constexpr static int kFirstBufferBindingIdx = GrMtlUniformHandler::kLastUniformBinding + 1;
     int index = inputBufferIndex + kFirstBufferBindingIdx;
     SkASSERT(index < 4);