Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 2 changesets (bug 1812982) for causing bc crash in RenderTextureHostSWGL.cpp.

Browse Source 
Backed out changeset c53591077218 (bug 1812982)
Backed out changeset 9c11387675b1 (bug 1812982)
This commit is contained in:
Iulian Moraru 2023-05-18 21:54:40 +03:00
parent c3ab401901
commit f5be562cbd
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gfx/webrender_bindings/RenderTextureHostSWGL.cpp
View File

@ -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;