From bf82b324bdcd7ea246f22e95a311c4ed528b161e Mon Sep 17 00:00:00 2001 From: Yun Hsiao Wu Date: Thu, 19 Nov 2020 21:26:27 +0800 Subject: [PATCH] fix semaphore --- native/cocos/renderer/core/CMakeLists.txt | 1 + .../renderer/core/thread/CommandEncoder.cpp | 4 +- .../renderer/core/thread/CommandEncoder.h | 6 +- .../cocos/renderer/core/thread/Semaphore.cpp | 64 ++----------------- native/cocos/renderer/core/thread/Semaphore.h | 30 +++------ .../cocos/renderer/gfx-gles2/CMakeLists.txt | 1 + .../cocos/renderer/gfx-gles3/CMakeLists.txt | 1 + .../cocos/renderer/gfx-metal/CMakeLists.txt | 7 +- .../cocos/renderer/gfx-vulkan/CMakeLists.txt | 1 + .../cocos/renderer/gfx-vulkan/VKContext.cpp | 2 +- 10 files changed, 25 insertions(+), 92 deletions(-) diff --git a/native/cocos/renderer/core/CMakeLists.txt b/native/cocos/renderer/core/CMakeLists.txt index e9240e6c5b..e941f19831 100644 --- a/native/cocos/renderer/core/CMakeLists.txt +++ b/native/cocos/renderer/core/CMakeLists.txt @@ -26,6 +26,7 @@ set(INCLUDE_FILES ${GFX_EXTERNAL_PATH}/nedmalloc ${GFX_EXTERNAL_PATH}/tommyds ${GFX_EXTERNAL_PATH}/boost + ${GFX_EXTERNAL_PATH}/concurrentqueue ${COCOS_SRC_PATH}/renderer/core ) diff --git a/native/cocos/renderer/core/thread/CommandEncoder.cpp b/native/cocos/renderer/core/thread/CommandEncoder.cpp index 97da87ddb2..756bb91fe8 100644 --- a/native/cocos/renderer/core/thread/CommandEncoder.cpp +++ b/native/cocos/renderer/core/thread/CommandEncoder.cpp @@ -81,8 +81,8 @@ void CommandEncoder::Kick() noexcept void CommandEncoder::KickAndWait() noexcept { - EventCV event; - EventCV *const pEvent = &event; + EventSem event; + EventSem *const pEvent = &event; ENCODE_COMMAND_1( this, WaitUntilFinish, diff --git a/native/cocos/renderer/core/thread/CommandEncoder.h b/native/cocos/renderer/core/thread/CommandEncoder.h index 56b860866f..54fd601c93 100644 --- a/native/cocos/renderer/core/thread/CommandEncoder.h +++ b/native/cocos/renderer/core/thread/CommandEncoder.h @@ -151,8 +151,8 @@ private: WriterContext mW; ReaderContext mR; - EventSem mN; - bool mImmediateMode { true }; + EventCV mN; + bool mImmediateMode { false }; bool mWorkerAttached { false }; bool mFreeChunksByUser { false }; // 被回收的Chunk会被记录到一个队列里 由用户在生产者线程选择合适的时机来Free @@ -179,7 +179,7 @@ public: private: - CommandEncoder* mCommandBuffer {nullptr }; + CommandEncoder* mCommandBuffer { nullptr }; uint8_t* mNewChunk { nullptr }; uint8_t* mOldChunk { nullptr }; }; diff --git a/native/cocos/renderer/core/thread/Semaphore.cpp b/native/cocos/renderer/core/thread/Semaphore.cpp index f02427d813..c7ce93695f 100644 --- a/native/cocos/renderer/core/thread/Semaphore.cpp +++ b/native/cocos/renderer/core/thread/Semaphore.cpp @@ -1,75 +1,21 @@ #include "Semaphore.h" -namespace cc { -namespace gfx { - -#ifdef _WINDOWS - Semaphore::Semaphore() noexcept +: mSemaphore(0) { - mSemaphore = CreateSemaphore(nullptr, 0, 0xFFFFFFFF, nullptr); } -Semaphore::~Semaphore() +Semaphore::Semaphore(uint32_t const initialCount) noexcept +: mSemaphore(initialCount) { - CloseHandle(mSemaphore); } void Semaphore::Wait() noexcept { - WaitForSingleObject(mSemaphore, 0xFFFFFFFF); + mSemaphore.wait(); } void Semaphore::Signal() noexcept { - ReleaseSemaphore(mSemaphore, 1, nullptr); + mSemaphore.signal(); } - -#elif defined(__APPLE__) - -Semaphore::Semaphore() noexcept -{ - mSemaphore = dispatch_semaphore_create(0); -} - -Semaphore::~Semaphore() -{ - dispatch_release(mSemaphore); -} - -void Semaphore::Wait() noexcept -{ - dispatch_semaphore_wait(mSemaphore, DISPATCH_TIME_FOREVER); -} - -void Semaphore::Signal() noexcept -{ - dispatch_semaphore_signal(mSemaphore); -} - -#else // Android - -Semaphore::Semaphore() noexcept -{ - sem_init(&mSemaphore, 0, 0); -} - -Semaphore::~Semaphore() -{ - sem_destroy(&mSemaphore); -} - -void Semaphore::Wait() noexcept -{ - sem_wait(&mSemaphore); -} - -void Semaphore::Signal() noexcept -{ - sem_post(&mSemaphore); -} - -#endif - -} // namespace gfx -} // namespace cc diff --git a/native/cocos/renderer/core/thread/Semaphore.h b/native/cocos/renderer/core/thread/Semaphore.h index a5e33abb08..dc980fb0a2 100644 --- a/native/cocos/renderer/core/thread/Semaphore.h +++ b/native/cocos/renderer/core/thread/Semaphore.h @@ -1,35 +1,21 @@ #pragma once #include -#ifdef _WINDOWS -#include -using NativeSemaphoreType = HANDLE; -#elif defined(__APPLE__) -#include -using NativeSemaphoreType = dispatch_semaphore_t; -#else // Android -#include -using NativeSemaphoreType = sem_t; -#endif - -namespace cc { -namespace gfx { +#include "concurrentqueue.h" +#include "lightweightsemaphore.h" class Semaphore final { public: - Semaphore() noexcept; - ~Semaphore(); + Semaphore() noexcept; + explicit Semaphore(uint32_t const initialCount) noexcept; - void Wait() noexcept; - void Signal() noexcept; - void SignalAll() noexcept { assert(false); } + void Wait() noexcept; + void Signal() noexcept; + void SignalAll() noexcept { assert(false); } private: - NativeSemaphoreType mSemaphore; + moodycamel::details::Semaphore mSemaphore; }; - -} // namespace gfx -} // namespace cc diff --git a/native/cocos/renderer/gfx-gles2/CMakeLists.txt b/native/cocos/renderer/gfx-gles2/CMakeLists.txt index fd141243a0..8fc703b414 100644 --- a/native/cocos/renderer/gfx-gles2/CMakeLists.txt +++ b/native/cocos/renderer/gfx-gles2/CMakeLists.txt @@ -9,6 +9,7 @@ set(INCLUDE_FILES ${GFX_EXTERNAL_PATH}/glsl_optimizer/src ${GFX_EXTERNAL_PATH}/glsl_optimizer/src/mesa ${GFX_EXTERNAL_PATH}/boost + ${GFX_EXTERNAL_PATH}/concurrentqueue ${COCOS_SRC_PATH}/renderer/core ${COCOS_SRC_PATH}/renderer/gfx-gles2 ) diff --git a/native/cocos/renderer/gfx-gles3/CMakeLists.txt b/native/cocos/renderer/gfx-gles3/CMakeLists.txt index 44aaff17e3..709f9e5fe9 100644 --- a/native/cocos/renderer/gfx-gles3/CMakeLists.txt +++ b/native/cocos/renderer/gfx-gles3/CMakeLists.txt @@ -9,6 +9,7 @@ set(INCLUDE_FILES ${GFX_EXTERNAL_PATH}/glsl_optimizer/src ${GFX_EXTERNAL_PATH}/glsl_optimizer/src/mesa ${GFX_EXTERNAL_PATH}/boost + ${GFX_EXTERNAL_PATH}/concurrentqueue ${COCOS_SRC_PATH}/renderer/core ${COCOS_SRC_PATH}/renderer/gfx-gles3 ) diff --git a/native/cocos/renderer/gfx-metal/CMakeLists.txt b/native/cocos/renderer/gfx-metal/CMakeLists.txt index b81d80d992..d868435b10 100644 --- a/native/cocos/renderer/gfx-metal/CMakeLists.txt +++ b/native/cocos/renderer/gfx-metal/CMakeLists.txt @@ -5,9 +5,10 @@ message(STATUS "Target: ${TARGET_NAME}...") # --------------------------------------------------------------------- # set include files -set(INCLUDE_FILES +set(INCLUDE_FILES ${GFX_EXTERNAL_PATH}/khronos ${GFX_EXTERNAL_PATH}/boost + ${GFX_EXTERNAL_PATH}/concurrentqueue ${COCOS_SRC_PATH}/base ${COCOS_SRC_PATH}/renderer/core ${COCOS_SRC_PATH}/renderer/gfx-metal @@ -50,7 +51,3 @@ set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME_DEBUG CCGFXMetal_d) use_precompiled_header("${CMAKE_CURRENT_SOURCE_DIR}/MTLStd.h" "${CMAKE_CURRENT_SOURCE_DIR}/MTLStd.cpp" ${SOURCE_CPP_FILES} ${SOURCE_OBJC_FILES} ${SOURCE_C_FILES}) message(STATUS "${TARGET_NAME} configuration completed.") - -target_compile_definitions(${TARGET_NAME} PUBLIC - $<$:CC_DEBUG=1> -) diff --git a/native/cocos/renderer/gfx-vulkan/CMakeLists.txt b/native/cocos/renderer/gfx-vulkan/CMakeLists.txt index 87559c2ef1..a67e29cbd4 100644 --- a/native/cocos/renderer/gfx-vulkan/CMakeLists.txt +++ b/native/cocos/renderer/gfx-vulkan/CMakeLists.txt @@ -7,6 +7,7 @@ message(STATUS "Target: ${TARGET_NAME}...") set(INCLUDE_FILES ${GFX_EXTERNAL_PATH}/khronos ${GFX_EXTERNAL_PATH}/boost + ${GFX_EXTERNAL_PATH}/concurrentqueue ${COCOS_EXTERNAL_PATH}/win32/include/glslang ${COCOS_SRC_PATH}/renderer/core ${COCOS_SRC_PATH}/renderer/gfx-vulkan diff --git a/native/cocos/renderer/gfx-vulkan/VKContext.cpp b/native/cocos/renderer/gfx-vulkan/VKContext.cpp index d6587af55b..2cc67f1bdc 100644 --- a/native/cocos/renderer/gfx-vulkan/VKContext.cpp +++ b/native/cocos/renderer/gfx-vulkan/VKContext.cpp @@ -44,7 +44,7 @@ constexpr uint FORCE_MINOR_VERSION = 0; // 0 for default version, ot constexpr uint DISABLE_VALIDATION_ASSERTIONS = 0; // 0 for default behavior, otherwise assertions will be disabled #define FORCE_ENABLE_VALIDATION 0 -#define FORCE_DISABLE_VALIDATION 0 +#define FORCE_DISABLE_VALIDATION 1 #if CC_DEBUG > 0 && !FORCE_DISABLE_VALIDATION || FORCE_ENABLE_VALIDATION VKAPI_ATTR VkBool32 VKAPI_CALL debugUtilsMessengerCallback(VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity,