commit cc5c7d9cd7eccf5b2f216b8e11e804dc8f7e771e
author Nicolas Capens <capn@google.com> Mon Jun 13 14:35:11 2016 -0400
committer Nicolas Capens <capn@google.com> Mon Jun 13 18:40:44 2016 +0000
tree 17d5cae5bbc068a7d745b0bde651f9699ec52c16
parent af93a4298f9b2dc235230149e57cd63d493c653c

Delete thread data at eglReleaseThread.

Bug 29279831

Change-Id: If5dbcb3e32e88d1e574d45d3368ed114fd4f85b7
Reviewed-on: https://swiftshader-review.googlesource.com/5581
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

src/OpenGL/libEGL/libEGL.cpp

diff --git a/src/OpenGL/libEGL/libEGL.cpp b/src/OpenGL/libEGL/libEGL.cpp
index 4d8a169..a85d301 100644
--- a/src/OpenGL/libEGL/libEGL.cpp
+++ b/src/OpenGL/libEGL/libEGL.cpp
@@ -485,7 +485,7 @@
 {
 	TRACE("()");
 
-	eglMakeCurrent(EGL_NO_DISPLAY, EGL_NO_CONTEXT, EGL_NO_SURFACE, EGL_NO_SURFACE);
+	detachThread();
 
 	return success(EGL_TRUE);
 }

src/OpenGL/libEGL/main.cpp

diff --git a/src/OpenGL/libEGL/main.cpp b/src/OpenGL/libEGL/main.cpp
index 2479b4e..4597165 100644
--- a/src/OpenGL/libEGL/main.cpp
+++ b/src/OpenGL/libEGL/main.cpp
@@ -62,7 +62,10 @@
 {
 	TRACE("()");
 
+	eglMakeCurrent(EGL_NO_DISPLAY, EGL_NO_CONTEXT, EGL_NO_SURFACE, EGL_NO_SURFACE);
+
 	delete (Current*)sw::Thread::getLocalStorage(currentTLS);
+	sw::Thread::setLocalStorage(currentTLS, nullptr);
 }
 
 CONSTRUCTOR void attachProcess()