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

Prevent deadlock when rapidly switching between openvr and desktop mode

Browse source
This commit is contained in:
Anthony J. Thibault 2016-10-06 15:44:24 -07:00
parent aecf71a0d0
commit 3158439cba
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
View file

@ -124,7 +124,6 @@ void HmdDisplayPlugin::uncustomizeContext() {
batch.setFramebuffer(_compositeFramebuffer); batch.setFramebuffer(_compositeFramebuffer);
batch.clearColorFramebuffer(gpu::Framebuffer::BUFFER_COLOR0, vec4(0)); batch.clearColorFramebuffer(gpu::Framebuffer::BUFFER_COLOR0, vec4(0));
}); });
internalPresent();
_overlayRenderer = OverlayRenderer(); _overlayRenderer = OverlayRenderer();
Parent::uncustomizeContext(); Parent::uncustomizeContext();
} }

2
libraries/shared/src/LogHandler.h
View file

@ -59,7 +59,7 @@ private:
QString _targetName; QString _targetName;
bool _shouldOutputProcessID { false }; bool _shouldOutputProcessID { false };
bool _shouldOutputThreadID { false }; bool _shouldOutputThreadID { true };
bool _shouldDisplayMilliseconds { false }; bool _shouldDisplayMilliseconds { false };
QSet<QString> _repeatedMessageRegexes; QSet<QString> _repeatedMessageRegexes;
QHash<QString, int> _repeatMessageCountHash; QHash<QString, int> _repeatMessageCountHash;