From d9cc8f81c2c887830eea301c63e6468a9cdfb649 Mon Sep 17 00:00:00 2001
From: SamoZ256 <96914946+SamoZ256@users.noreply.github.com>
Date: Fri, 16 Jan 2026 04:23:12 +0100
Subject: [PATCH] metal: Create temporary autorelease pools (#1783)

---
 .../HW/Latte/Renderer/Metal/MetalCommon.h     |  4 ++--
 .../HW/Latte/Renderer/Metal/MetalRenderer.cpp | 20 ++++++++++++++-----
 .../HW/Latte/Renderer/Metal/MetalRenderer.h   |  3 ---
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/Cafe/HW/Latte/Renderer/Metal/MetalCommon.h b/src/Cafe/HW/Latte/Renderer/Metal/MetalCommon.h
index d16c5597..1239f08d 100644
--- a/src/Cafe/HW/Latte/Renderer/Metal/MetalCommon.h
+++ b/src/Cafe/HW/Latte/Renderer/Metal/MetalCommon.h
@@ -50,12 +50,12 @@ inline size_t Align(size_t size, size_t alignment)
     return (size + alignment - 1) & ~(alignment - 1);
 }
 
-__attribute__((unused)) static inline void ETStackAutoRelease(void* object)
+__attribute__((unused)) static inline void StackAutoRelease(void* object)
 {
     (*(NS::Object**)object)->release();
 }
 
-#define NS_STACK_SCOPED __attribute__((cleanup(ETStackAutoRelease))) __attribute__((unused))
+#define NS_STACK_SCOPED __attribute__((cleanup(StackAutoRelease))) __attribute__((unused))
 
 // Cast from const char* to NS::String*
 inline NS::String* ToNSString(const char* str)
diff --git a/src/Cafe/HW/Latte/Renderer/Metal/MetalRenderer.cpp b/src/Cafe/HW/Latte/Renderer/Metal/MetalRenderer.cpp
index 360d6def..7ceaf74d 100644
--- a/src/Cafe/HW/Latte/Renderer/Metal/MetalRenderer.cpp
+++ b/src/Cafe/HW/Latte/Renderer/Metal/MetalRenderer.cpp
@@ -1690,7 +1690,9 @@ MTL::CommandBuffer* MetalRenderer::GetCommandBuffer()
         // Debug
         //m_commandQueue->insertDebugCaptureBoundary();
 
-	    MTL::CommandBuffer* mtlCommandBuffer = m_commandQueue->commandBuffer();
+        auto pool = NS::AutoreleasePool::alloc()->init();
+	    MTL::CommandBuffer* mtlCommandBuffer = m_commandQueue->commandBuffer()->retain();
+		pool->release();
 		m_currentCommandBuffer = {mtlCommandBuffer};
 
 		// Wait for the previous command buffer
@@ -1717,7 +1719,9 @@ MTL::RenderCommandEncoder* MetalRenderer::GetTemporaryRenderCommandEncoder(MTL::
 
     auto commandBuffer = GetCommandBuffer();
 
-    auto renderCommandEncoder = commandBuffer->renderCommandEncoder(renderPassDescriptor);
+    auto pool = NS::AutoreleasePool::alloc()->init();
+    auto renderCommandEncoder = commandBuffer->renderCommandEncoder(renderPassDescriptor)->retain();
+    pool->release();
 #ifdef CEMU_DEBUG_ASSERT
     renderCommandEncoder->setLabel(GetLabel("Temporary render command encoder", renderCommandEncoder));
 #endif
@@ -1780,7 +1784,9 @@ MTL::RenderCommandEncoder* MetalRenderer::GetRenderCommandEncoder(bool forceRecr
 
     auto commandBuffer = GetCommandBuffer();
 
-    auto renderCommandEncoder = commandBuffer->renderCommandEncoder(m_state.m_activeFBO.m_fbo->GetRenderPassDescriptor());
+    auto pool = NS::AutoreleasePool::alloc()->init();
+    auto renderCommandEncoder = commandBuffer->renderCommandEncoder(m_state.m_activeFBO.m_fbo->GetRenderPassDescriptor())->retain();
+    pool->release();
 #ifdef CEMU_DEBUG_ASSERT
     renderCommandEncoder->setLabel(GetLabel("Render command encoder", renderCommandEncoder));
 #endif
@@ -1813,7 +1819,9 @@ MTL::ComputeCommandEncoder* MetalRenderer::GetComputeCommandEncoder()
 
     auto commandBuffer = GetCommandBuffer();
 
-    auto computeCommandEncoder = commandBuffer->computeCommandEncoder();
+    auto pool = NS::AutoreleasePool::alloc()->init();
+    auto computeCommandEncoder = commandBuffer->computeCommandEncoder()->retain();
+    pool->release();
     m_commandEncoder = computeCommandEncoder;
     m_encoderType = MetalEncoderType::Compute;
 
@@ -1836,7 +1844,9 @@ MTL::BlitCommandEncoder* MetalRenderer::GetBlitCommandEncoder()
 
     auto commandBuffer = GetCommandBuffer();
 
-    auto blitCommandEncoder = commandBuffer->blitCommandEncoder();
+    auto pool = NS::AutoreleasePool::alloc()->init();
+    auto blitCommandEncoder = commandBuffer->blitCommandEncoder()->retain();
+    pool->release();
     m_commandEncoder = blitCommandEncoder;
     m_encoderType = MetalEncoderType::Blit;
 
diff --git a/src/Cafe/HW/Latte/Renderer/Metal/MetalRenderer.h b/src/Cafe/HW/Latte/Renderer/Metal/MetalRenderer.h
index 428284f2..e905b834 100644
--- a/src/Cafe/HW/Latte/Renderer/Metal/MetalRenderer.h
+++ b/src/Cafe/HW/Latte/Renderer/Metal/MetalRenderer.h
@@ -534,9 +534,6 @@ private:
         MTL::CommandBuffer* m_lastCommandBuffer = nullptr;
 	} m_occlusionQuery;
 
-	// Autorelease pool
-	NS::AutoreleasePool* m_autoreleasePool;
-
 	// Active objects
 	MetalCommandBuffer m_currentCommandBuffer{};
 	std::vector<MTL::CommandBuffer*> m_executingCommandBuffers;