mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 15:42:39 +08:00
Add jobsystem backend option (#3372)
This commit is contained in:
+27
-11
@@ -142,6 +142,8 @@ set_if_undefined(USE_MIDDLEWARE ON)
|
||||
set_if_undefined(USE_DRAGONBONES ON)
|
||||
set_if_undefined(USE_SPINE ON)
|
||||
set_if_undefined(USE_WEBSOCKET_SERVER OFF)
|
||||
set_if_undefined(USE_JOB_SYSTEM_TASKFLOW OFF)
|
||||
set_if_undefined(USE_JOB_SYSTEM_TBB OFF)
|
||||
set_if_undefined(USE_PHYSICS_PHYSX OFF)
|
||||
|
||||
if(ANDROID OR WINDOWS)
|
||||
@@ -190,6 +192,10 @@ if(USE_DRAGONBONES OR USE_SPINE)
|
||||
set(USE_MIDDLEWARE ON)
|
||||
endif()
|
||||
|
||||
if("${USE_JOB_SYSTEM_TBB}" STREQUAL "${USE_JOB_SYSTEM_TASKFLOW}")
|
||||
set(USE_JOB_SYSTEM_TASKFLOW ON)
|
||||
set(USE_JOB_SYSTEM_TBB OFF)
|
||||
endif()
|
||||
|
||||
################################# list all option values ##############################
|
||||
|
||||
@@ -212,6 +218,8 @@ inspect_values(
|
||||
USE_SE_V8
|
||||
USE_V8_DEBUGGER
|
||||
USE_PHYSICS_PHYSX
|
||||
USE_JOB_SYSTEM_TBB
|
||||
USE_JOB_SYSTEM_TASKFLOW
|
||||
)
|
||||
|
||||
################################# external source code ################################
|
||||
@@ -415,19 +423,25 @@ cocos_source_files(
|
||||
|
||||
##### job system
|
||||
cocos_source_files(
|
||||
cocos/base/job-system/JobSystem.h
|
||||
|
||||
cocos/base/job-system/job-system-taskflow/TFJobGraph.h
|
||||
cocos/base/job-system/job-system-taskflow/TFJobGraph.cpp
|
||||
cocos/base/job-system/job-system-taskflow/TFJobSystem.h
|
||||
cocos/base/job-system/job-system-taskflow/TFJobSystem.cpp
|
||||
|
||||
cocos/base/job-system/job-system-tbb/TBBJobGraph.h
|
||||
cocos/base/job-system/job-system-tbb/TBBJobGraph.cpp
|
||||
cocos/base/job-system/job-system-tbb/TBBJobSystem.h
|
||||
cocos/base/job-system/job-system-tbb/TBBJobSystem.cpp
|
||||
cocos/base/job-system/JobSystem.h
|
||||
)
|
||||
|
||||
if(USE_JOB_SYSTEM_TASKFLOW)
|
||||
cocos_source_files(
|
||||
cocos/base/job-system/job-system-taskflow/TFJobGraph.h
|
||||
cocos/base/job-system/job-system-taskflow/TFJobGraph.cpp
|
||||
cocos/base/job-system/job-system-taskflow/TFJobSystem.h
|
||||
cocos/base/job-system/job-system-taskflow/TFJobSystem.cpp
|
||||
)
|
||||
elseif(USE_JOB_SYSTEM_TBB)
|
||||
cocos_source_files(
|
||||
cocos/base/job-system/job-system-tbb/TBBJobGraph.h
|
||||
cocos/base/job-system/job-system-tbb/TBBJobGraph.cpp
|
||||
cocos/base/job-system/job-system-tbb/TBBJobSystem.h
|
||||
cocos/base/job-system/job-system-tbb/TBBJobSystem.cpp
|
||||
)
|
||||
endif()
|
||||
|
||||
##### math
|
||||
cocos_source_files(
|
||||
cocos/math/Geometry.cpp
|
||||
@@ -1748,6 +1762,8 @@ target_compile_definitions(cocos2d PUBLIC
|
||||
$<IF:$<BOOL:${USE_MIDDLEWARE}>,USE_MIDDLEWARE=1,USE_MIDDLEWARE=0>
|
||||
$<IF:$<BOOL:${USE_SPINE}>,USE_SPINE=1,USE_SPINE=0>
|
||||
$<IF:$<BOOL:${USE_DRAGONBONES}>,USE_DRAGONBONES=1,USE_DRAGONBONES=0>
|
||||
$<IF:$<BOOL:${USE_JOB_SYSTEM_TBB}>,USE_JOB_SYSTEM_TBB=1,USE_JOB_SYSTEM_TBB=0>
|
||||
$<IF:$<BOOL:${USE_JOB_SYSTEM_TASKFLOW}>,USE_JOB_SYSTEM_TASKFLOW=1,USE_JOB_SYSTEM_TASKFLOW=0>
|
||||
$<IF:$<BOOL:${USE_PHYSICS_PHYSX}>,USE_PHYSICS_PHYSX=1,USE_PHYSICS_PHYSX=0>
|
||||
$<$<BOOL:${USE_SE_JSC}>:SCRIPT_ENGINE_TYPE=3>
|
||||
$<$<CONFIG:Debug>:CC_DEBUG=1>
|
||||
|
||||
+24
-20
@@ -28,44 +28,48 @@
|
||||
#include "base/Macros.h"
|
||||
|
||||
// STD including
|
||||
#include <cassert>
|
||||
#include <cfloat>
|
||||
#include <cmath>
|
||||
#include <cstdio>
|
||||
#include <cstdlib>
|
||||
#include <cwchar>
|
||||
#include <cmath>
|
||||
#include <cfloat>
|
||||
#include <cassert>
|
||||
#include <ctime>
|
||||
#include <cwchar>
|
||||
#include <limits>
|
||||
|
||||
// STL including
|
||||
#include <array>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <list>
|
||||
#include <queue>
|
||||
#include <deque>
|
||||
#include <set>
|
||||
#include <map>
|
||||
#include <unordered_map>
|
||||
#include <algorithm>
|
||||
#include <array>
|
||||
#include <atomic>
|
||||
#include <cmath>
|
||||
#include <cstdint>
|
||||
#include <deque>
|
||||
#include <exception>
|
||||
#include <functional>
|
||||
#include <cmath>
|
||||
#include <atomic>
|
||||
#include <list>
|
||||
#include <map>
|
||||
#include <mutex>
|
||||
#include <queue>
|
||||
#include <set>
|
||||
#include <string>
|
||||
#include <thread>
|
||||
#include <cstdint>
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
|
||||
#include "base/TypeDef.h"
|
||||
#include "base/memory/Memory.h"
|
||||
#include "base/CachedArray.h"
|
||||
#include "base/Log.h"
|
||||
#include "base/Object.h"
|
||||
#include "base/CachedArray.h"
|
||||
#include "base/StringUtil.h"
|
||||
#include "base/TypeDef.h"
|
||||
#include "base/memory/Memory.h"
|
||||
|
||||
#include "math/Math.h"
|
||||
|
||||
#define CC_JOB_SYSTEM_TASKFLOW 1
|
||||
#define CC_JOB_SYSTEM_TBB 2
|
||||
|
||||
#define CC_JOB_SYSTEM CC_JOB_SYSTEM_TASKFLOW
|
||||
#if USE_JOB_SYSTEM_TBB
|
||||
#define CC_JOB_SYSTEM CC_JOB_SYSTEM_TBB
|
||||
#elif USE_JOB_SYSTEM_TASKFLOW
|
||||
#define CC_JOB_SYSTEM CC_JOB_SYSTEM_TASKFLOW
|
||||
#endif
|
||||
|
||||
@@ -9,19 +9,21 @@ set(TARGET_OSX_VERSION "10.14" CACHE STRING "Target MacOSX version" FORCE)
|
||||
set(TARGET_IOS_VERSION "12.0" CACHE STRING "Target iOS version" FORCE)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 14)
|
||||
option(USE_SE_V8 "USE V8 JavaScript Engine" ON)
|
||||
option(USE_SE_V8 "Use V8 JavaScript Engine" ON)
|
||||
option(USE_V8_DEBUGGER "Enable Chrome Remote inspector" ON)
|
||||
option(USE_SOCKET "Enable WebSocket & SocketIO" ON)
|
||||
option(USE_AUDIO "Enable Audio" ON) #Enable AudioEngine
|
||||
option(USE_EDIT_BOX "Enable EditBox" ON)
|
||||
option(USE_SE_JSC "USE JavaScriptCore on MacOSX/iOS" OFF)
|
||||
option(USE_SE_JSC "Use JavaScriptCore on MacOSX/iOS" OFF)
|
||||
option(USE_VIDEO "Enable VideoPlayer Component" ON)
|
||||
option(USE_WEBVIEW "Enable WebView Component" ON)
|
||||
option(USE_MIDDLEWARE "Enable Middleware" ON)
|
||||
option(USE_DRAGONBONES "Enable Dragonbones" ON)
|
||||
option(USE_SPINE "Enable Spine" ON)
|
||||
option(USE_WEBSOCKET_SERVER "Enable WebSocket Server" OFF)
|
||||
option(USE_PHYSICS_PHYSX "USE PhysX Physics" ON)
|
||||
option(USE_WEBSOCKET_SERVER "Enable WebSocket Server" OFF)
|
||||
option(USE_JOB_SYSTEM_TASKFLOW "Use taskflow as job system backend" OFF)
|
||||
option(USE_JOB_SYSTEM_TBB "Use tbb as job system backend" OFF)
|
||||
option(USE_PHYSICS_PHYSX "USE PhysX Physics" ON)
|
||||
|
||||
if(NOT RES_DIR)
|
||||
message(FATAL_ERROR "RES_DIR is not set!")
|
||||
|
||||
Reference in New Issue
Block a user