TracePerfTest: Delete offscreen objects only when initialized.

Delete Textures, Renderbuffers and Framebuffers that were created in the SurfaceType::Offscreen case, when they were initialized. This caused a crash when replaying traces using GLES 1 contexts on native GLES Android implementations. Bug: angleproject:5932 Change-Id: Ice4bcec620a6c3530044986ce39230b030a901ab Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2877234Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Cody Northrop <cnorthrop@google.com> Commit-Queue: Cody Northrop <cnorthrop@google.com>

TracePerfTest: Delete offscreen objects only when initialized.
c0d42fd9 · Lubosz Sarnecki · Commit Bot · a83fe36d · c0d42fd9
Commit c0d42fd9 authored May 06, 2021 by Lubosz Sarnecki Committed by Commit Bot May 10, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

TracePerfTest.cpp src/tests/perf_tests/TracePerfTest.cpp +10 -6

No files found.
--- a/src/tests/perf_tests/TracePerfTest.cpp
+++ b/src/tests/perf_tests/TracePerfTest.cpp
@@ -1071,14 +1071,18 @@ void TracePerfTest::initializeBenchmark()
 void TracePerfTest::destroyBenchmark()
 {
-    glDeleteTextures(mMaxOffscreenBufferCount, mOffscreenTextures.data());
+    const auto &params = GetParam();
-    mOffscreenTextures.fill(0);
+    if (params.surfaceType == SurfaceType::Offscreen)
+    {
+        glDeleteTextures(mMaxOffscreenBufferCount, mOffscreenTextures.data());
+        mOffscreenTextures.fill(0);
-    glDeleteRenderbuffers(1, &mOffscreenDepthStencil);
+        glDeleteRenderbuffers(1, &mOffscreenDepthStencil);
-    mOffscreenDepthStencil = 0;
+        mOffscreenDepthStencil = 0;
-    glDeleteFramebuffers(mMaxOffscreenBufferCount, mOffscreenFramebuffers.data());
+        glDeleteFramebuffers(mMaxOffscreenBufferCount, mOffscreenFramebuffers.data());
-    mOffscreenFramebuffers.fill(0);
+        mOffscreenFramebuffers.fill(0);
+    }
    mTraceLibrary->finishReplay();
    mTraceLibrary.reset(nullptr);