mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-30 03:32:36 +00:00
Code Issues Projects Releases Wiki Activity

Fix threading issues

Browse Source
This commit is contained in:
florent.teppe 2022-08-12 18:26:04 +02:00
parent baadc06e98
commit decfbc5387
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwrender/renderingmanager.cpp
View File

@ -901,7 +901,9 @@ namespace MWRender
void RenderingManager::update(float dt, bool paused) void RenderingManager::update(float dt, bool paused)
{ {
reportStats(); reportStats();
mResourceSystem->getSceneManager()->getShaderManager().update();
mResourceSystem->getSceneManager()->getShaderManager().update(*mViewer);
float rainIntensity = mSky->getPrecipitationAlpha(); float rainIntensity = mSky->getPrecipitationAlpha();
mWater->setRainIntensity(rainIntensity); mWater->setRainIntensity(rainIntensity);

26
components/shader/shadermanager.cpp
View File

@ -369,9 +369,11 @@ namespace Shader
std::unordered_map<std::string, std::set<std::filesystem::path>> templateIncludedFiles; std::unordered_map<std::string, std::set<std::filesystem::path>> templateIncludedFiles;
std::filesystem::file_time_type mLastAutoRecompileTime; std::filesystem::file_time_type mLastAutoRecompileTime;
bool mHotReloadEnabled; bool mHotReloadEnabled;
bool mTriggerReload;
HotReloadManager() HotReloadManager()
{ {
mTriggerReload = false;
mHotReloadEnabled = false; mHotReloadEnabled = false;
mLastAutoRecompileTime = std::filesystem::file_time_type::clock::now(); mLastAutoRecompileTime = std::filesystem::file_time_type::clock::now();
} }
@ -385,21 +387,29 @@ namespace Shader
} }
} }
void update(ShaderManager& Manager) void update(ShaderManager& Manager,osgViewer::Viewer& viewer)
{ {
auto timeSinceLastCheckMillis = std::chrono::duration_cast<std::chrono::milliseconds>(std::filesystem::file_time_type::clock::now() - mLastAutoRecompileTime); auto timeSinceLastCheckMillis = std::chrono::duration_cast<std::chrono::milliseconds>(std::filesystem::file_time_type::clock::now() - mLastAutoRecompileTime);
if (mHotReloadEnabled && timeSinceLastCheckMillis.count() > 200) if ((mHotReloadEnabled && timeSinceLastCheckMillis.count() > 200) || mTriggerReload == true)
reloadTouchedShaders(Manager); {
reloadTouchedShaders(Manager, viewer);
}
mTriggerReload = false;
} }
void reloadTouchedShaders(ShaderManager& Manager) void reloadTouchedShaders(ShaderManager& Manager, osgViewer::Viewer& viewer)
{ {
bool threadsRunningTostop = false;
for (auto& [pathShaderToTest, shaderKeys]: mShaderFiles) for (auto& [pathShaderToTest, shaderKeys]: mShaderFiles)
{ {
std::filesystem::file_time_type write_time = std::filesystem::last_write_time(pathShaderToTest); std::filesystem::file_time_type write_time = std::filesystem::last_write_time(pathShaderToTest);
if (write_time.time_since_epoch() > mLastAutoRecompileTime.time_since_epoch()) if (write_time.time_since_epoch() > mLastAutoRecompileTime.time_since_epoch())
{ {
threadsRunningTostop = viewer.areThreadsRunning();
if (threadsRunningTostop)
viewer.stopThreading();
for (const auto& [templateName, shaderDefines]: shaderKeys) for (const auto& [templateName, shaderDefines]: shaderKeys)
{ {
ShaderManager::ShaderMap::iterator shaderIt = Manager.mShaders.find(std::make_pair(templateName, shaderDefines)); ShaderManager::ShaderMap::iterator shaderIt = Manager.mShaders.find(std::make_pair(templateName, shaderDefines));
@ -437,6 +447,8 @@ namespace Shader
} }
} }
} }
if (threadsRunningTostop)
viewer.startThreading();
mLastAutoRecompileTime = std::filesystem::file_time_type::clock::now(); mLastAutoRecompileTime = std::filesystem::file_time_type::clock::now();
} }
}; };
@ -625,9 +637,9 @@ namespace Shader
return unit; return unit;
} }
void ShaderManager::update() void ShaderManager::update(osgViewer::Viewer& viewer)
{ {
mHotReloadManager->update(*this); mHotReloadManager->update(*this, viewer);
} }
void ShaderManager::setHotReloadEnabled(bool value) void ShaderManager::setHotReloadEnabled(bool value)
@ -637,7 +649,7 @@ namespace Shader
void ShaderManager::triggerShaderReload() void ShaderManager::triggerShaderReload()
{ {
mHotReloadManager->reloadTouchedShaders(*this); mHotReloadManager->mTriggerReload = true;
} }
} }

2
components/shader/shadermanager.hpp
View File

@ -69,7 +69,7 @@ namespace Shader
int reserveGlobalTextureUnits(Slot slot); int reserveGlobalTextureUnits(Slot slot);
void update(); void update(osgViewer::Viewer& viewer);
void setHotReloadEnabled(bool value); void setHotReloadEnabled(bool value);
void triggerShaderReload(); void triggerShaderReload();
private: private: