Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:44:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make display plugin switching atomic from other threads

Browse source
This commit is contained in:
Brad Davis 2016-03-24 15:19:46 -07:00
parent caf2595e13
commit 520cccb219
2 changed files with 30 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
interface/src/Application.cpp
View file

@ -4677,13 +4677,18 @@ qreal Application::getDevicePixelRatio() {
}
DisplayPlugin* Application::getActiveDisplayPlugin() {
std::unique_lock<std::recursive_mutex> lock(_displayPluginLock);
if (nullptr == _displayPlugin && QThread::currentThread() == thread()) {
updateDisplayMode();
Q_ASSERT(_displayPlugin);
DisplayPlugin* result = nullptr;
if (QThread::currentThread() == thread()) {
if (nullptr == _displayPlugin) {
updateDisplayMode();
Q_ASSERT(_displayPlugin);
}
result = _displayPlugin.get();
} else {
std::unique_lock<std::mutex> lock(_displayPluginLock);
result = _displayPlugin.get();
}
return _displayPlugin.get();
return result;
}
const DisplayPlugin* Application::getActiveDisplayPlugin() const {
@ -4801,20 +4806,26 @@ void Application::updateDisplayMode() {
return;
}
if (_displayPlugin) {
_displayPlugin->deactivate();
}
auto offscreenUi = DependencyManager::get<OffscreenUi>();
// FIXME probably excessive and useless context switching
_offscreenContext->makeCurrent();
newDisplayPlugin->activate();
_offscreenContext->makeCurrent();
offscreenUi->resize(fromGlm(newDisplayPlugin->getRecommendedUiSize()));
_offscreenContext->makeCurrent();
getApplicationCompositor().setDisplayPlugin(newDisplayPlugin);
_displayPlugin = newDisplayPlugin;
// Make the switch atomic from the perspective of other threads
{
std::unique_lock<std::mutex> lock(_displayPluginLock);
if (_displayPlugin) {
_displayPlugin->deactivate();
}
// FIXME probably excessive and useless context switching
_offscreenContext->makeCurrent();
newDisplayPlugin->activate();
_offscreenContext->makeCurrent();
offscreenUi->resize(fromGlm(newDisplayPlugin->getRecommendedUiSize()));
_offscreenContext->makeCurrent();
getApplicationCompositor().setDisplayPlugin(newDisplayPlugin);
_displayPlugin = newDisplayPlugin;
}
emit activeDisplayPluginChanged();

2
interface/src/Application.h
View file

@ -383,7 +383,7 @@ private:
OffscreenGLCanvas* _offscreenContext { nullptr };
DisplayPluginPointer _displayPlugin;
std::recursive_mutex _displayPluginLock;
std::mutex _displayPluginLock;
InputPluginList _activeInputPlugins;
bool _activatingDisplayPlugin { false };