From 638d624f5a8880bd0d8f44cc9bbb6cf0b478f0f7 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Thu, 4 Oct 2018 20:21:23 -0400
Subject: [PATCH] metal: Don't try to create a zero-byte vertex buffer.

(Which will cause a crash in Metal, or an assert in the validation layer.)
---
 src/render/metal/SDL_render_metal.m | 39 ++++++++++++++++-------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/render/metal/SDL_render_metal.m b/src/render/metal/SDL_render_metal.m
index 49d21b89b42ec..affe0de2511f6 100644
--- a/src/render/metal/SDL_render_metal.m
+++ b/src/render/metal/SDL_render_metal.m
@@ -1052,6 +1052,7 @@ - (void)dealloc
 { @autoreleasepool {
     METAL_RenderData *data = (__bridge METAL_RenderData *) renderer->driverdata;
     METAL_DrawStateCache statecache;
+    id<MTLBuffer> mtlbufvertex = nil;
 
     statecache.pipeline = nil;
     statecache.constants_offset = CONSTANTS_OFFSET_INVALID;
@@ -1063,24 +1064,26 @@ - (void)dealloc
     statecache.color_offset = 0;
 
     // !!! FIXME: have a ring of pre-made MTLBuffers we cycle through? How expensive is creation?
-    id<MTLBuffer> mtlbufvertexstaging = [data.mtldevice newBufferWithLength:vertsize options:MTLResourceStorageModeShared];
-    #if !__has_feature(objc_arc)
-    [mtlbufvertexstaging autorelease];
-    #endif
-    mtlbufvertexstaging.label = @"SDL vertex staging data";
-    SDL_memcpy([mtlbufvertexstaging contents], vertices, vertsize);
-
-    // Move our new vertex buffer from system RAM to GPU memory so any draw calls can use it.
-    id<MTLBuffer> mtlbufvertex = [data.mtldevice newBufferWithLength:vertsize options:MTLResourceStorageModePrivate];
-    #if !__has_feature(objc_arc)
-    [mtlbufvertex autorelease];
-    #endif
-    mtlbufvertex.label = @"SDL vertex data";
-    id<MTLCommandBuffer> cmdbuffer = [data.mtlcmdqueue commandBuffer];
-    id<MTLBlitCommandEncoder> blitcmd = [cmdbuffer blitCommandEncoder];
-    [blitcmd copyFromBuffer:mtlbufvertexstaging sourceOffset:0 toBuffer:mtlbufvertex destinationOffset:0 size:vertsize];
-    [blitcmd endEncoding];
-    [cmdbuffer commit];
+    if (vertsize > 0) {
+        id<MTLBuffer> mtlbufvertexstaging = [data.mtldevice newBufferWithLength:vertsize options:MTLResourceStorageModeShared];
+        #if !__has_feature(objc_arc)
+        [mtlbufvertexstaging autorelease];
+        #endif
+        mtlbufvertexstaging.label = @"SDL vertex staging data";
+        SDL_memcpy([mtlbufvertexstaging contents], vertices, vertsize);
+
+        // Move our new vertex buffer from system RAM to GPU memory so any draw calls can use it.
+        mtlbufvertex = [data.mtldevice newBufferWithLength:vertsize options:MTLResourceStorageModePrivate];
+        #if !__has_feature(objc_arc)
+        [mtlbufvertex autorelease];
+        #endif
+        mtlbufvertex.label = @"SDL vertex data";
+        id<MTLCommandBuffer> cmdbuffer = [data.mtlcmdqueue commandBuffer];
+        id<MTLBlitCommandEncoder> blitcmd = [cmdbuffer blitCommandEncoder];
+        [blitcmd copyFromBuffer:mtlbufvertexstaging sourceOffset:0 toBuffer:mtlbufvertex destinationOffset:0 size:vertsize];
+        [blitcmd endEncoding];
+        [cmdbuffer commit];
+    }
 
     // If there's a command buffer here unexpectedly (app requested one?). Commit it so we can start fresh.
     [data.mtlcmdencoder endEncoding];