From 1b9e72e3a6f7aea86d78cb0b7143601c33d0c06d Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Thu, 24 Aug 2023 18:04:30 +1000
Subject: [PATCH] MetalDevice: Fix render command encoder leak

and subsequent crash on shutdown.
---
 src/util/metal_device.mm | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/util/metal_device.mm b/src/util/metal_device.mm
index 36b4ffeda..a2a845d96 100644
--- a/src/util/metal_device.mm
+++ b/src/util/metal_device.mm
@@ -1829,21 +1829,23 @@ void MetalDevice::BeginRenderPass()
     m_inline_upload_encoder = nil;
   }
 
-  MTLRenderPassDescriptor* desc;
-  if (!m_current_framebuffer)
-  {
-    // Rendering to view, but we got interrupted...
-    desc = [MTLRenderPassDescriptor renderPassDescriptor];
-    desc.colorAttachments[0].texture = [m_layer_drawable texture];
-    desc.colorAttachments[0].loadAction = MTLLoadActionLoad;
-  }
-  else
-  {
-    desc = m_current_framebuffer->GetDescriptor();
-  }
+  @autoreleasepool {
+    MTLRenderPassDescriptor* desc;
+    if (!m_current_framebuffer)
+    {
+      // Rendering to view, but we got interrupted...
+      desc = [MTLRenderPassDescriptor renderPassDescriptor];
+      desc.colorAttachments[0].texture = [m_layer_drawable texture];
+      desc.colorAttachments[0].loadAction = MTLLoadActionLoad;
+    }
+    else
+    {
+      desc = m_current_framebuffer->GetDescriptor();
+    }
 
-  m_render_encoder = [m_render_cmdbuf renderCommandEncoderWithDescriptor:desc];
-  SetInitialEncoderState();
+    m_render_encoder = [[m_render_cmdbuf renderCommandEncoderWithDescriptor:desc] retain];
+    SetInitialEncoderState();
+  }
 }
 
 void MetalDevice::EndRenderPass()