Merge pull request #20131 from Mee-gu/checkMemoryLeak

minggo · web-flow · commit b3dba7b93e69 · 2019-09-20T14:37:02.000+08:00
fix memory leak on metal app
diff --git a/cocos/renderer/backend/metal/CommandBufferMTL.h b/cocos/renderer/backend/metal/CommandBufferMTL.h
@@ -195,6 +195,7 @@ class CommandBufferMTL final : public CommandBuffer
     
     dispatch_semaphore_t _frameBoundarySemaphore;
     RenderPassDescriptor _prevRenderPassDescriptor;
+    NSAutoreleasePool* _autoReleasePool = nil;
 };
 
 // end of _metal group
diff --git a/cocos/renderer/backend/metal/CommandBufferMTL.mm b/cocos/renderer/backend/metal/CommandBufferMTL.mm
@@ -220,6 +220,7 @@ MTLCullMode toMTLCullMode(CullMode mode)
 
 void CommandBufferMTL::beginFrame()
 {
+    _autoReleasePool = [[NSAutoreleasePool alloc] init];
     dispatch_semaphore_wait(_frameBoundarySemaphore, DISPATCH_TIME_FOREVER);
 
     _mtlCommandBuffer = [_mtlCommandQueue commandBuffer];
@@ -366,6 +367,7 @@ MTLCullMode toMTLCullMode(CullMode mode)
     [_mtlCommandBuffer commit];
     [_mtlCommandBuffer release];
     DeviceMTL::resetCurrentDrawable();
+    [_autoReleasePool drain];
 }
 
 void CommandBufferMTL::afterDraw()

Original file line number	Diff line number	Diff line change
`@@ -220,6 +220,7 @@ MTLCullMode toMTLCullMode(CullMode mode)`
`220`	`220`
`221`	`221`	`void CommandBufferMTL::beginFrame()`
`222`	`222`	`{`
	`223`	`+ _autoReleasePool = [[NSAutoreleasePool alloc] init];`
`223`	`224`	`dispatch_semaphore_wait(_frameBoundarySemaphore, DISPATCH_TIME_FOREVER);`
`224`	`225`
`225`	`226`	`_mtlCommandBuffer = [_mtlCommandQueue commandBuffer];`
`@@ -366,6 +367,7 @@ MTLCullMode toMTLCullMode(CullMode mode)`
`366`	`367`	`[_mtlCommandBuffer commit];`
`367`	`368`	`[_mtlCommandBuffer release];`
`368`	`369`	`DeviceMTL::resetCurrentDrawable();`
	`370`	`+ [_autoReleasePool drain];`
`369`	`371`	`}`
`370`	`372`
`371`	`373`	`void CommandBufferMTL::afterDraw()`