From bf78abc63cde2b69e09ac5548c245a244c37942e Mon Sep 17 00:00:00 2001 From: pandamicro Date: Fri, 8 Jan 2021 21:03:59 +0800 Subject: [PATCH] Fix current drawable access issue --- native/cocos/renderer/gfx-metal/MTLCommandBuffer.h | 1 + native/cocos/renderer/gfx-metal/MTLCommandBuffer.mm | 13 ++++++++----- native/cocos/renderer/gfx-metal/MTLDevice.mm | 1 + 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/native/cocos/renderer/gfx-metal/MTLCommandBuffer.h b/native/cocos/renderer/gfx-metal/MTLCommandBuffer.h index 10cf8ecbf3..867fcb80d3 100644 --- a/native/cocos/renderer/gfx-metal/MTLCommandBuffer.h +++ b/native/cocos/renderer/gfx-metal/MTLCommandBuffer.h @@ -72,6 +72,7 @@ public: CC_INLINE bool isCommandBufferBegan() const { return _commandBufferBegan; } CC_INLINE id getMTLCommandBuffer() const { return _mtlCommandBuffer; } id getCurrentDrawable(); + void disposeCurrentDrawable(); private: void bindDescriptorSets(); diff --git a/native/cocos/renderer/gfx-metal/MTLCommandBuffer.mm b/native/cocos/renderer/gfx-metal/MTLCommandBuffer.mm index cb30e7c7bd..7f90f3abd6 100644 --- a/native/cocos/renderer/gfx-metal/MTLCommandBuffer.mm +++ b/native/cocos/renderer/gfx-metal/MTLCommandBuffer.mm @@ -74,6 +74,13 @@ id CCMTLCommandBuffer::getCurrentDrawable() { return _currDrawable; } +void CCMTLCommandBuffer::disposeCurrentDrawable() { + if (_currDrawable) { + [_currDrawable release]; + _currDrawable = nil; + } +} + bool CCMTLCommandBuffer::isRenderingEntireDrawable(const Rect &rect, const CCMTLRenderPass *renderPass) { const int num = renderPass->getColorRenderTargetNums(); if (num == 0) { @@ -118,11 +125,7 @@ void CCMTLCommandBuffer::end() { // Secondary command buffer should end encoding here _commandEncoder.endEncoding(); } - - if (_currDrawable) { - [_currDrawable release]; - _currDrawable = nil; - } + disposeCurrentDrawable(); if (_autoreleasePool) { // CC_LOG_INFO("%d CB POOL: %p RELEASED for %p", [NSThread currentThread], _autoreleasePool, this); diff --git a/native/cocos/renderer/gfx-metal/MTLDevice.mm b/native/cocos/renderer/gfx-metal/MTLDevice.mm index cbf0ca1335..d0850d9f48 100644 --- a/native/cocos/renderer/gfx-metal/MTLDevice.mm +++ b/native/cocos/renderer/gfx-metal/MTLDevice.mm @@ -248,6 +248,7 @@ void CCMTLDevice::present() { _inFlightSemaphore->signal(); }]; [mtlCommandBuffer commit]; + cmdBuff->disposeCurrentDrawable(); if (_autoreleasePool) { // CC_LOG_INFO("POOL: %p RELEASED", _autoreleasePool);