From 9d9e3efce077dbfe261b13fdfb3b20fc1e4a5e4c Mon Sep 17 00:00:00 2001
From: Mohan Maiya <m.maiya@samsung.com>
Date: Mon, 30 Dec 2024 12:10:57 -0800
Subject: [PATCH] Proper clean up for EGLLockSurface3Test

Perform unmakecurrent during test teardown

Bug: angleproject:42264593
Change-Id: I1148b5c6631e81090f7ae931495bba1b43c24502
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6133539
Reviewed-by: Yuxin Hu <yuxinhu@google.com>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Commit-Queue: mohan maiya <m.maiya@samsung.com>
---
 src/tests/egl_tests/EGLLockSurface3Test.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/tests/egl_tests/EGLLockSurface3Test.cpp b/src/tests/egl_tests/EGLLockSurface3Test.cpp
index 6fb42df12ac..8f7b5e5ecc3 100644
--- a/src/tests/egl_tests/EGLLockSurface3Test.cpp
+++ b/src/tests/egl_tests/EGLLockSurface3Test.cpp
@@ -48,6 +48,8 @@ class EGLLockSurface3Test : public ANGLETest<>
     {
         if (mDisplay != EGL_NO_DISPLAY)
         {
+            EXPECT_EGL_TRUE(
+                eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT));
             eglTerminate(mDisplay);
             eglReleaseThread();
             mDisplay = EGL_NO_DISPLAY;