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

Merge pull request #7575 from jherico/oculus_crash

Browse source 
Don't release the Oculus plugin when disabling the plugin
This commit is contained in:
Brad Hefta-Gaub 2016-04-05 13:50:46 -07:00
commit 7c6c75c484
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/oculus/src/OculusDisplayPlugin.cpp
View file

@ -52,6 +52,16 @@ void OculusDisplayPlugin::customizeContext() {
} }
void OculusDisplayPlugin::uncustomizeContext() { void OculusDisplayPlugin::uncustomizeContext() {
using namespace oglplus;
// Present a final black frame to the HMD
_compositeFramebuffer->Bound(FramebufferTarget::Draw, [] {
Context::ClearColor(0, 0, 0, 1);
Context::Clear().ColorBuffer();
});
hmdPresent();
#if (OVR_MAJOR_VERSION >= 6) #if (OVR_MAJOR_VERSION >= 6)
_sceneFbo.reset(); _sceneFbo.reset();
#endif #endif

4
plugins/oculus/src/OculusHelpers.cpp
View file

@ -90,12 +90,16 @@ ovrSession acquireOculusSession() {
void releaseOculusSession() { void releaseOculusSession() {
Q_ASSERT(refCount > 0 && session); Q_ASSERT(refCount > 0 && session);
// HACK the Oculus runtime doesn't seem to play well with repeated shutdown / restart.
// So for now we'll just hold on to the session
#if 0
if (!--refCount) { if (!--refCount) {
qCDebug(oculus) << "oculus: zero refcount, shutdown SDK and session"; qCDebug(oculus) << "oculus: zero refcount, shutdown SDK and session";
ovr_Destroy(session); ovr_Destroy(session);
ovr_Shutdown(); ovr_Shutdown();
session = nullptr; session = nullptr;
} }
#endif
} }