commit aa86cf5503ecd887b28037796aee4159b37e3fd1
author Yahan Zhou <yahan@google.com> Fri Jul 21 16:41:19 2017 -0700
committer Yahan Zhou <yahan@google.com> Fri Jul 21 16:44:02 2017 -0700
tree fc2c6e7c38d220ce6b52919469f0ba52a3843874
parent 2cc4bcd8508ae53860fe85c6489f2b231fa8439a

Fix teapot example app

Before eglMakeCurrent, it checks the pointer to the window surface to
avoid expansive host calls. But the window surfaces can end up having
the same pointer with different host handles. So we skip the check.

b/63918908

Change-Id: Ic76e299bed68c6eca9ae2a74ef18dc5cee2e4bd4

system/egl/egl.cpp

diff --git a/system/egl/egl.cpp b/system/egl/egl.cpp
index 185fbc9..ec1c186 100644
--- a/system/egl/egl.cpp
+++ b/system/egl/egl.cpp
@@ -1516,11 +1516,14 @@
     //
     EGLThreadInfo *tInfo = getEGLThreadInfo();
 
-    if (tInfo->currentContext == context &&
-        (context == NULL ||
-        (context && context->draw == draw && context->read == read))) {
-        return EGL_TRUE;
-    }
+    // we cannot use the following code block because of this bug:
+    // b/63918908
+
+    //if (tInfo->currentContext == context &&
+    //    (context == NULL ||
+    //    (context && context->draw == draw && context->read == read))) {
+    //    return EGL_TRUE;
+    //}
 
     if (tInfo->currentContext && tInfo->currentContext->deletePending) {
         if (tInfo->currentContext != context) {