From f5be562cbdb36ca19720168d91c684f654b9e4fe Mon Sep 17 00:00:00 2001
From: Iulian Moraru <imoraru@mozilla.com>
Date: Thu, 18 May 2023 21:54:40 +0300
Subject: [PATCH] Backed out 2 changesets (bug 1812982) for causing bc crash in
 RenderTextureHostSWGL.cpp.

Backed out changeset c53591077218 (bug 1812982)
Backed out changeset 9c11387675b1 (bug 1812982)
---
 gfx/webrender_bindings/RenderTextureHostSWGL.cpp | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/gfx/webrender_bindings/RenderTextureHostSWGL.cpp b/gfx/webrender_bindings/RenderTextureHostSWGL.cpp
index 4849b4bba032..ad2d960837e0 100644
--- a/gfx/webrender_bindings/RenderTextureHostSWGL.cpp
+++ b/gfx/webrender_bindings/RenderTextureHostSWGL.cpp
@@ -14,11 +14,8 @@ namespace mozilla {
 namespace wr {
 
 bool RenderTextureHostSWGL::UpdatePlanes(RenderCompositor* aCompositor) {
-  size_t planeCount = GetPlaneCount();
-  if (!planeCount) {
-    return false;
-  }
   wr_swgl_make_current(mContext);
+  size_t planeCount = GetPlaneCount();
   bool texInit = false;
   if (mPlanes.size() < planeCount) {
     mPlanes.reserve(planeCount);
@@ -153,9 +150,6 @@ void RenderTextureHostSWGL::CleanupPlanes() {
     return;
   }
   if (!mPlanes.empty()) {
-    if (mLocked) {
-      gfxCriticalNote << "Clearing locked planes!";
-    }
     wr_swgl_make_current(mContext);
     for (const auto& plane : mPlanes) {
       wr_swgl_delete_texture(mContext, plane.mTexture);
@@ -179,7 +173,7 @@ bool RenderTextureHostSWGL::LockSWGLCompositeSurface(
     }
     mLocked = true;
   }
-  MOZ_RELEASE_ASSERT(mPlanes.size() <= 3);
+  MOZ_ASSERT(mPlanes.size() <= 3);
   for (size_t i = 0; i < mPlanes.size(); i++) {
     aInfo->textures[i] = mPlanes[i].mTexture;
   }
@@ -203,7 +197,6 @@ bool RenderTextureHostSWGL::LockSWGLCompositeSurface(
       MOZ_RELEASE_ASSERT(false, "Unhandled external image format");
       break;
   }
-  MOZ_RELEASE_ASSERT(mPlanes.size() > 0);
   aInfo->size.width = mPlanes[0].mSize.width;
   aInfo->size.height = mPlanes[0].mSize.height;
   return true;