commit 41e6f2f700da4577b4e0bbad49c9e3b60a17d5c6
author Yahan Zhou <yahan@google.com> Tue Aug 08 18:38:19 2017 -0700
committer Yahan Zhou <yahan@google.com> Tue Aug 08 18:38:19 2017 -0700
tree 82f1546575b07fd5c4108a0496a2e6ad9e70168e
parent 24135c414e194750254a8a46d23c7645b3ec98b1

Correct logic of surface delete

The old surface delete logic is incorrect when destroying surface bound
to a different thread.

BUG: 37101765

Test: cts -m CtsMediaTestCases -t android.media.cts.DecodeAccuracyTest
Change-Id: Icdec052abbe46e3292088b79ebb779ee24581ed4

system/egl/egl.cpp

diff --git a/system/egl/egl.cpp b/system/egl/egl.cpp
index 01398ff..3a3e3b3 100644
--- a/system/egl/egl.cpp
+++ b/system/egl/egl.cpp
@@ -283,6 +283,8 @@
     virtual     void setCollectingTimestamps(EGLint collect) { }
     virtual     EGLint isCollectingTimestamps() const { return EGL_FALSE; }
     EGLint      deletePending;
+    void        setIsCurrent(bool isCurrent) { mIsCurrent = isCurrent; }
+    bool        isCurrent() const { return mIsCurrent;}
 private:
     //
     //Surface attributes
@@ -296,6 +298,7 @@
     // Give it some default values.
     int nativeWidth;
     int nativeHeight;
+    bool mIsCurrent;
 protected:
     void        setWidth(EGLint w)  { width = w;  }
     void        setHeight(EGLint h) { height = h; }
@@ -308,7 +311,7 @@
 
 egl_surface_t::egl_surface_t(EGLDisplay dpy, EGLConfig config, EGLint surfaceType)
     : dpy(dpy), config(config), surfaceType(surfaceType), rcSurface(0),
-      deletePending(0)
+      deletePending(0), mIsCurrent(false)
 {
     width = 0;
     height = 0;
@@ -1009,9 +1012,7 @@
 
     EGLThreadInfo* tInfo = getEGLThreadInfo();
     egl_surface_t* surface(static_cast<egl_surface_t*>(eglSurface));
-    if (tInfo->currentContext
-        && (tInfo->currentContext->draw == eglSurface
-        || tInfo->currentContext->read == eglSurface)) {
+    if (surface->isCurrent()) {
         surface->deletePending = 1;
     } else {
         delete surface;
@@ -1507,8 +1508,8 @@
 
     if (!context) return EGL_TRUE;
 
-    if (getEGLThreadInfo()->currentContext == context) {
-        getEGLThreadInfo()->currentContext->deletePending = 1;
+    if (context->flags & EGLContext_t::IS_CURRENT) {
+        context->deletePending = 1;
         return EGL_TRUE;
     }
 
@@ -1558,6 +1559,12 @@
     if (tInfo->currentContext) {
         EGLContext_t* prevCtx = tInfo->currentContext;
 
+        if (prevCtx->draw) {
+            static_cast<egl_surface_t *>(prevCtx->draw)->setIsCurrent(false);
+        }
+        if (prevCtx->read) {
+            static_cast<egl_surface_t *>(prevCtx->read)->setIsCurrent(false);
+        }
         s_destroyPendingSurfacesInContext(tInfo->currentContext);
 
         if (prevCtx->deletePending && prevCtx != context) {
@@ -1587,6 +1594,12 @@
         hostCon->setGrallocOnly(false);
         context->draw = draw;
         context->read = read;
+        if (drawSurf) {
+            drawSurf->setIsCurrent(true);
+        }
+        if (readSurf) {
+            readSurf->setIsCurrent(true);
+        }
         context->flags |= EGLContext_t::IS_CURRENT;
         GLClientState* contextState =
             context->getClientState();