mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 20:45:34 +00:00
Code Issues Releases Wiki Activity

Merge branch 'limit_max_bullet_supported_threads' into 'master'

Browse source 
Limit max bullet supported threads by BT_MAX_THREAD_COUNT - 1

See merge request OpenMW/openmw!2797

(cherry picked from commit 31ae1cd339)

949b9191 Limit max bullet supported threads by BT_MAX_THREAD_COUNT - 1
This commit is contained in:
psi29a 2023-03-04 12:42:51 +00:00
parent a6989dcb12
commit 0fb7d93219
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/mwphysics/mtphysics.cpp
View file

@ -7,6 +7,7 @@
#include <BulletCollision/BroadphaseCollision/btDbvtBroadphase.h>
#include <BulletCollision/CollisionShapes/btCollisionShape.h>
#include <LinearMath/btThreads.h>
#include <osg/Stats>
@ -297,10 +298,11 @@ namespace MWPhysics
{
namespace
{
int getMaxBulletSupportedThreads()
unsigned getMaxBulletSupportedThreads()
{
auto broad = std::make_unique<btDbvtBroadphase>();
return broad->m_rayTestStacks.size();
assert(BT_MAX_THREAD_COUNT > 0);
return std::min<unsigned>(broad->m_rayTestStacks.size(), BT_MAX_THREAD_COUNT - 1);
}
LockingPolicy detectLockingPolicy()
@ -322,8 +324,8 @@ namespace MWPhysics
case LockingPolicy::ExclusiveLocksOnly:
return 1;
case LockingPolicy::AllowSharedLocks:
return static_cast<unsigned>(std::clamp(
Settings::Manager::getInt("async num threads", "Physics"), 0, getMaxBulletSupportedThreads()));
return std::clamp<unsigned>(
Settings::Manager::getInt("async num threads", "Physics"), 0, getMaxBulletSupportedThreads());
}
throw std::runtime_error("Unsupported LockingPolicy: "