commit 75b79d3f73acd9b86307523c9f12762fab29a253
author Jesse Hall <jessehall@google.com> Mon Jul 25 03:38:04 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 25 03:38:04 2016 +0000
tree 9c4fd7c6792b60883633f7706aaf58c17886c0f9
parent 5271156353ac020f44d51ce818b0b7faeb61b87e
parent 3ac517a852386e7b7c93d5fb7adee90fe7bf7d86

Merge "egl: Call loseCurrent after eglReleaseThread"

opengl/libs/EGL/eglApi.cpp

diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp
index cfae095..34e840d 100644
--- a/opengl/libs/EGL/eglApi.cpp
+++ b/opengl/libs/EGL/eglApi.cpp
@@ -1339,13 +1339,14 @@
         GLTrace_eglReleaseThread();
 #endif
 
-    // If there is context bound to the thread, release it
-    egl_display_t::loseCurrent(get_context(getContext()));
-
     egl_connection_t* const cnx = &gEGLImpl;
     if (cnx->dso && cnx->egl.eglReleaseThread) {
         cnx->egl.eglReleaseThread();
     }
+
+    // If there is context bound to the thread, release it
+    egl_display_t::loseCurrent(get_context(getContext()));
+
     egl_tls_t::clearTLS();
     return EGL_TRUE;
 }