From 8d4b6cbc96eb489e96d97458b3bd6dc2cb980e35 Mon Sep 17 00:00:00 2001 From: Yiwen <15225434259xue@gmail.com> Date: Tue, 5 Jul 2022 09:56:46 +0800 Subject: [PATCH] fix the device crach appeared when the device fallback is performed (#11818) * fix the device crach appeared when the device fallback is performed * Fix crash on SM-9005 (#2) Co-authored-by: James Chen --- .../cocos/renderer/gfx-agent/DeviceAgent.cpp | 24 +++++++++++-------- native/cocos/renderer/gfx-base/GFXDevice.cpp | 4 ++-- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/native/cocos/renderer/gfx-agent/DeviceAgent.cpp b/native/cocos/renderer/gfx-agent/DeviceAgent.cpp index f1f54fd523..e2e08020f9 100644 --- a/native/cocos/renderer/gfx-agent/DeviceAgent.cpp +++ b/native/cocos/renderer/gfx-agent/DeviceAgent.cpp @@ -23,11 +23,11 @@ THE SOFTWARE. ****************************************************************************/ +#include #include #include "base/Log.h" #include "base/threading/MessageQueue.h" #include "base/threading/ThreadSafeLinearAllocator.h" -#include #include "BufferAgent.h" #include "CommandBufferAgent.h" @@ -92,12 +92,16 @@ bool DeviceAgent::doInit(const DeviceInfo &info) { } void DeviceAgent::doDestroy() { - ENQUEUE_MESSAGE_1( - _mainMessageQueue, DeviceDestroy, - actor, _actor, - { - actor->destroy(); - }); + if (!_mainMessageQueue) { + _actor->destroy(); + } else { + ENQUEUE_MESSAGE_1( + _mainMessageQueue, DeviceDestroy, + actor, _actor, + { + actor->destroy(); + }); + } if (_cmdBuff) { static_cast(_cmdBuff)->destroyAgent(); @@ -118,7 +122,7 @@ void DeviceAgent::doDestroy() { if (_mainMessageQueue) { _mainMessageQueue->terminateConsumerThread(); - + // NOTE: C++17 required when enable alignment // TODO(PatriceJiang): replace with: CC_SAFE_DELETE(_mainMessageQueue); _mainMessageQueue->~MessageQueue(); @@ -287,10 +291,10 @@ void doBufferTextureCopy(const uint8_t *const *buffers, Texture *texture, const for (uint32_t i = 0U; i < count; i++) { bufferCount += regions[i].texSubres.layerCount; } - + Format format = texture->getFormat(); constexpr uint32_t alignment = 16; - + size_t totalSize = boost::alignment::align_up(sizeof(BufferTextureCopy) * count + sizeof(uint8_t *) * bufferCount, alignment); for (uint32_t i = 0U; i < count; i++) { const BufferTextureCopy ®ion = regions[i]; diff --git a/native/cocos/renderer/gfx-base/GFXDevice.cpp b/native/cocos/renderer/gfx-base/GFXDevice.cpp index 415da620c9..12b414064b 100644 --- a/native/cocos/renderer/gfx-base/GFXDevice.cpp +++ b/native/cocos/renderer/gfx-base/GFXDevice.cpp @@ -62,9 +62,9 @@ bool Device::initialize(const DeviceInfo &info) { #endif bool result = doInit(info); - _cmdBuff->addRef(); - _queue->addRef(); + CC_SAFE_ADD_REF(_cmdBuff); + CC_SAFE_ADD_REF(_queue); return result; }