Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 23:07:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash in vive and interleaved stereo plugins

Browse source
This commit is contained in:
Brad Davis 2019-02-15 10:46:08 -08:00
parent af25a7bf6e
commit 5483971855
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
View file

@ -720,7 +720,7 @@ void OpenGLDisplayPlugin::present() {
} }
gpu::Backend::freeGPUMemSize.set(gpu::gl::getFreeDedicatedMemory()); gpu::Backend::freeGPUMemSize.set(gpu::gl::getFreeDedicatedMemory());
} else { } else if (alwaysPresent()) {
internalPresent(); internalPresent();
} }
_movingAveragePresent.addSample((float)(usecTimestampNow() - startPresent)); _movingAveragePresent.addSample((float)(usecTimestampNow() - startPresent));

5
libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
View file

@ -88,6 +88,11 @@ protected:
glm::uvec2 getSurfaceSize() const; glm::uvec2 getSurfaceSize() const;
glm::uvec2 getSurfacePixels() const; glm::uvec2 getSurfacePixels() const;
// Some display plugins require us to always execute some present logic,
// whether we have a frame or not (Oculus Mobile plugin)
// Such plugins must be prepared to do the right thing if the `_currentFrame`
// is not populated
virtual bool alwaysPresent() const { return false; }
void updateCompositeFramebuffer(); void updateCompositeFramebuffer();

1
libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.h
View file

@ -57,6 +57,7 @@ protected:
void internalPresent() override; void internalPresent() override;
void hmdPresent() override { throw std::runtime_error("Unused"); } void hmdPresent() override { throw std::runtime_error("Unused"); }
bool isHmdMounted() const override; bool isHmdMounted() const override;
bool alwaysPresent() const override { return true; }
static const char* NAME; static const char* NAME;
mutable gl::Context* _mainContext{ nullptr }; mutable gl::Context* _mainContext{ nullptr };