Bug 1630170 - Delete XRWebGLLayer Framebuffer on XRSession presentati…

…on end r=kip,jgilbert,daoshengmu Differential Revision: https://phabricator.services.mozilla.com/D71063 --HG-- extra : moz-landing-system : lando
dothq · Apr 15, 2020 · 025f4b6 · 025f4b6
1 parent e3dd202
commit 025f4b6
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 1 deletion.
diff --git a/dom/canvas/XRWebGLLayer.cpp b/dom/canvas/XRWebGLLayer.cpp
@@ -47,10 +47,15 @@ XRWebGLLayer::XRWebGLLayer(
 }
 
 XRWebGLLayer::~XRWebGLLayer() {
+  DeleteFramebuffer();
+  mozilla::DropJSObjects(this);
+}
+
+void XRWebGLLayer::DeleteFramebuffer() {
   if (mFramebuffer) {
     mWebGL->DeleteFramebuffer(mFramebuffer.get(), true);
+    mFramebuffer = nullptr;
   }
-  mozilla::DropJSObjects(this);
 }
 
 /* static */
@@ -246,5 +251,7 @@ HTMLCanvasElement* XRWebGLLayer::GetCanvas() {
   return mWebGL->GetParentObject();
 }
 
+void XRWebGLLayer::SessionEnded() { DeleteFramebuffer(); }
+
 }  // namespace dom
 }  // namespace mozilla
diff --git a/dom/canvas/XRWebGLLayer.h b/dom/canvas/XRWebGLLayer.h
@@ -62,8 +62,10 @@ class XRWebGLLayer final : public nsWrapperCache {
   void StartAnimationFrame();
   void EndAnimationFrame();
   HTMLCanvasElement* GetCanvas();
+  void SessionEnded();
 
  private:
+  void DeleteFramebuffer();
   virtual ~XRWebGLLayer();
   nsCOMPtr<nsISupports> mParent;
 

diff --git a/dom/vr/XRRenderState.cpp b/dom/vr/XRRenderState.cpp
@@ -82,5 +82,13 @@ bool XRRenderState::IsCompositionDisabled() const {
   return mCompositionDisabled;
 }
 
+void XRRenderState::SessionEnded() {
+  if (mBaseLayer) {
+    mBaseLayer->SessionEnded();
+    mBaseLayer = nullptr;
+  }
+  mOutputCanvas = nullptr;
+}
+
 }  // namespace dom
 }  // namespace mozilla
diff --git a/dom/vr/XRRenderState.h b/dom/vr/XRRenderState.h
@@ -45,6 +45,7 @@ class XRRenderState final : public nsWrapperCache {
   HTMLCanvasElement* GetOutputCanvas() const;
   void SetCompositionDisabled(bool aCompositionDisabled);
   bool IsCompositionDisabled() const;
+  void SessionEnded();
 
  protected:
   virtual ~XRRenderState() = default;

diff --git a/dom/vr/XRSession.cpp b/dom/vr/XRSession.cpp
@@ -415,6 +415,14 @@ void XRSession::ExitPresentInternal() {
     mXRSystem->SessionEnded(this);
   }
 
+  if (mActiveRenderState) {
+    mActiveRenderState->SessionEnded();
+  }
+
+  if (mPendingRenderState) {
+    mPendingRenderState->SessionEnded();
+  }
+
   mDisplayPresentation = nullptr;
   if (!mEnded) {
     mEnded = true;