Recreate SwapChain before binding if the target FBO is invalid (#3713)

Fixes #3712
MozillaReality · Jul 22, 2020 · 797d8c1 · 797d8c1
1 parent f3bbaef
commit 797d8c1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/app/src/oculusvr/cpp/DeviceDelegateOculusVR.cpp b/app/src/oculusvr/cpp/DeviceDelegateOculusVR.cpp
@@ -1020,7 +1020,15 @@ DeviceDelegateOculusVR::BindEye(const device::Eye aWhich) {
 
   const auto &swapChain = m.eyeSwapChains[index];
   int swapChainIndex = m.frameIndex % swapChain->swapChainLength;
-  m.currentFBO = swapChain->fbos[swapChainIndex];
+  m.currentFBO = swapChain->FBO(swapChainIndex);
+  if (!m.currentFBO || !m.currentFBO->IsValid()) {
+    // See https://github.com/MozillaReality/FirefoxReality/issues/3712
+    // There are some crash reports of invalid eye SwapChain FBOs. Try to recreate it.
+    VRB_LOG("Recreate SwapChain because no valid FBO was found");
+    auto render = m.context.lock();
+    swapChain->Init(render, m.renderMode, m.renderWidth, m.renderHeight);
+    m.currentFBO = swapChain->FBO(swapChainIndex);
+  }
 
   if (m.currentFBO) {
     m.currentFBO->Bind();

diff --git a/app/src/oculusvr/cpp/OculusSwapChain.cpp b/app/src/oculusvr/cpp/OculusSwapChain.cpp
@@ -56,4 +56,11 @@ OculusEyeSwapChain::Destroy() {
   swapChainLength = 0;
 }
 
+vrb::FBOPtr OculusEyeSwapChain::FBO(const int32_t aIndex) {
+  if (aIndex >=0 && aIndex < fbos.size()) {
+    return fbos[aIndex];
+  }
+  return nullptr;
+}
+
 }
diff --git a/app/src/oculusvr/cpp/OculusSwapChain.h b/app/src/oculusvr/cpp/OculusSwapChain.h
@@ -16,11 +16,13 @@ class OculusEyeSwapChain {
 public:
   ovrTextureSwapChain *ovrSwapChain = nullptr;
   int swapChainLength = 0;
-  std::vector<vrb::FBOPtr> fbos;
 
   static OculusEyeSwapChainPtr create();
   void Init(vrb::RenderContextPtr &aContext, device::RenderMode aMode, uint32_t aWidth, uint32_t aHeight);
   void Destroy();
+  vrb::FBOPtr FBO(const int32_t aIndex);
+private:
+  std::vector<vrb::FBOPtr> fbos;
 };
 
 }