Commit d46165e3 by Geoff Lang Committed by Commit Bot

Reland "Don't call Texture::onDestroy twice for the zero textures."

This reverts commit 3adcf1e4. Reason for revert: Likely not the cause of failures seen. Original change's description: > Revert "Don't call Texture::onDestroy twice for the zero textures." > > This reverts commit d3e0e84c. > > Reason for revert: likely cause for crbug.com/922296 > > BUG=chromium:922296 > > Original change's description: > > Don't call Texture::onDestroy twice for the zero textures. > > > > The BindingPointer will call onDestroy when all references are removed, no > > need to do it explicitly. > > > > BUG=angleproject:3070 > > > > Change-Id: Ic5dd4da8f73e204d26d9d3a3c6e1eff9fded5411 > > Reviewed-on: https://chromium-review.googlesource.com/c/1409868 > > Reviewed-by: Jamie Madill <jmadill@chromium.org> > > Commit-Queue: Geoff Lang <geofflang@chromium.org> > > TBR=geofflang@chromium.org,jmadill@chromium.org > > Change-Id: I38097218d49940e7ac3ad914714294b019c154fd > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: angleproject:3070 > Reviewed-on: https://chromium-review.googlesource.com/c/1413239 > Reviewed-by: Corentin Wallez <cwallez@chromium.org> > Commit-Queue: Corentin Wallez <cwallez@chromium.org> TBR=geofflang@chromium.org,jmadill@chromium.org,cwallez@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: chromium:922296, angleproject:3070 Change-Id: I58b1c445f81e4a7f38df375fd3311043b571e834 Reviewed-on: https://chromium-review.googlesource.com/c/1417770Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>
parent c66cd693
......@@ -535,7 +535,6 @@ egl::Error Context::onDestroy(const egl::Display *display)
{
if (zeroTexture.get() != nullptr)
{
zeroTexture->onDestroy(this);
zeroTexture.set(this, nullptr);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment