mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 08:02:39 +08:00
fix semaphore
This commit is contained in:
committed by
Yun Hsiao Wu
parent
c8f1be8f71
commit
bf82b324bd
@@ -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
|
||||
)
|
||||
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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 };
|
||||
};
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,35 +1,21 @@
|
||||
#pragma once
|
||||
|
||||
#include <cassert>
|
||||
#ifdef _WINDOWS
|
||||
#include <windows.h>
|
||||
using NativeSemaphoreType = HANDLE;
|
||||
#elif defined(__APPLE__)
|
||||
#include <dispatch/dispatch.h>
|
||||
using NativeSemaphoreType = dispatch_semaphore_t;
|
||||
#else // Android
|
||||
#include <semaphore.h>
|
||||
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
|
||||
|
||||
@@ -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
|
||||
)
|
||||
|
||||
@@ -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
|
||||
)
|
||||
|
||||
@@ -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
|
||||
$<$<CONFIG:Debug>:CC_DEBUG=1>
|
||||
)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user