Clean up EGL thread state at thread exit in nanobench and DM

src/gpu/gl/command_buffer/SkCommandBufferGLContext.cpp

 
 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkOnce.h"
 #include "gl/GrGLInterface.h"
 #include "gl/GrGLAssembleInterface.h"
@@ skipping 36 matching lines @@
 #define EGL_HEIGHT 0x3056
 
 #else
 
 #include <EGL/egl.h>
 
 #endif
 
 typedef EGLDisplay (*GetDisplayProc)(EGLNativeDisplayType display_id);
 typedef EGLBoolean (*InitializeProc)(EGLDisplay dpy, EGLint *major, EGLint *minor);
-typedef EGLBoolean (*TerminateProc)(EGLDisplay dpy);
+typedef EGLBoolean (*ReleaseThreadProc)();
 typedef EGLBoolean (*ChooseConfigProc)(EGLDisplay dpy, const EGLint* attrib_list, EGLConfig* configs, EGLint config_size, EGLint* num_config);
 typedef EGLBoolean (*GetConfigAttrib)(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint* value);
 typedef EGLSurface (*CreateWindowSurfaceProc)(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint* attrib_list);
 typedef EGLSurface (*CreatePbufferSurfaceProc)(EGLDisplay dpy, EGLConfig config, const EGLint* attrib_list);
 typedef EGLBoolean (*DestroySurfaceProc)(EGLDisplay dpy, EGLSurface surface);
 typedef EGLContext (*CreateContextProc)(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint* attrib_list);
 typedef EGLBoolean (*DestroyContextProc)(EGLDisplay dpy, EGLContext ctx);
 typedef EGLBoolean (*MakeCurrentProc)(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx);
 typedef EGLBoolean (*SwapBuffersProc)(EGLDisplay dpy, EGLSurface surface);
 typedef __eglMustCastToProperFunctionPointerType (*GetProcAddressProc)(const char* procname);
 
 static GetDisplayProc gfGetDisplay = nullptr;
 static InitializeProc gfInitialize = nullptr;
-static TerminateProc gfTerminate = nullptr;
+static ReleaseThreadProc gfReleaseThread = nullptr;
 static ChooseConfigProc gfChooseConfig = nullptr;
 static GetConfigAttrib gfGetConfigAttrib = nullptr;
 static CreateWindowSurfaceProc gfCreateWindowSurface = nullptr;
 static CreatePbufferSurfaceProc gfCreatePbufferSurface = nullptr;
 static DestroySurfaceProc gfDestroySurface = nullptr;
 static CreateContextProc gfCreateContext = nullptr;
 static DestroyContextProc gfDestroyContext = nullptr;
 static MakeCurrentProc gfMakeCurrent = nullptr;
 static SwapBuffersProc gfSwapBuffers = nullptr;
 static GetProcAddressProc gfGetProcAddress = nullptr;
 
 static void* gLibrary = nullptr;
 static bool gfFunctionsLoadedSuccessfully = false;
 
 static void load_command_buffer_functions() {
     if (!gLibrary) {
 #if defined _WIN32
         gLibrary = DynamicLoadLibrary("command_buffer_gles2.dll");
 #elif defined SK_BUILD_FOR_MAC
         gLibrary = DynamicLoadLibrary("libcommand_buffer_gles2.dylib");
 #else
         gLibrary = DynamicLoadLibrary("libcommand_buffer_gles2.so");
 #endif // defined _WIN32
         if (gLibrary) {
             gfGetDisplay = (GetDisplayProc)GetProcedureAddress(gLibrary, "eglGetDisplay");
             gfInitialize = (InitializeProc)GetProcedureAddress(gLibrary, "eglInitialize");
-            gfTerminate = (TerminateProc)GetProcedureAddress(gLibrary, "eglTerminate");
+            gfReleaseThread = (ReleaseThreadProc)GetProcedureAddress(gLibrary, "eglReleaseThread");
             gfChooseConfig = (ChooseConfigProc)GetProcedureAddress(gLibrary, "eglChooseConfig");
             gfGetConfigAttrib = (GetConfigAttrib)GetProcedureAddress(gLibrary, "eglGetConfigAttrib");
             gfCreateWindowSurface = (CreateWindowSurfaceProc)GetProcedureAddress(gLibrary, "eglCreateWindowSurface");
             gfCreatePbufferSurface = (CreatePbufferSurfaceProc)GetProcedureAddress(gLibrary, "eglCreatePbufferSurface");
             gfDestroySurface = (DestroySurfaceProc)GetProcedureAddress(gLibrary, "eglDestroySurface");
             gfCreateContext = (CreateContextProc)GetProcedureAddress(gLibrary, "eglCreateContext");
             gfDestroyContext = (DestroyContextProc)GetProcedureAddress(gLibrary, "eglDestroyContext");
             gfMakeCurrent = (MakeCurrentProc)GetProcedureAddress(gLibrary, "eglMakeCurrent");
             gfSwapBuffers = (SwapBuffersProc)GetProcedureAddress(gLibrary, "eglSwapBuffers");
             gfGetProcAddress = (GetProcAddressProc)GetProcedureAddress(gLibrary, "eglGetProcAddress");
 
-            gfFunctionsLoadedSuccessfully = gfGetDisplay && gfInitialize && gfTerminate &&
+            gfFunctionsLoadedSuccessfully = gfGetDisplay && gfInitialize && gfReleaseThread &&
                                             gfChooseConfig && gfCreateWindowSurface &&
                                             gfCreatePbufferSurface && gfDestroySurface &&
                                             gfCreateContext && gfDestroyContext && gfMakeCurrent &&
                                             gfSwapBuffers && gfGetProcAddress;
 
         }
     }
 }
 
 static GrGLFuncPtr command_buffer_get_gl_proc(void* ctx, const char name[]) {
@@ skipping 156 matching lines @@
         if (fContext) {
             gfDestroyContext(fDisplay, fContext);
             fContext = EGL_NO_CONTEXT;
         }
 
         if (fSurface) {
             gfDestroySurface(fDisplay, fSurface);
             fSurface = EGL_NO_SURFACE;
         }
 
-        gfTerminate(fDisplay);
         fDisplay = EGL_NO_DISPLAY;
     }
 }
 
 void SkCommandBufferGLContext::onPlatformMakeCurrent() const {
     if (!gfFunctionsLoadedSuccessfully) {
         return;
     }
     if (!gfMakeCurrent(fDisplay, fSurface, fSurface, fContext)) {
         SkDebugf("Command Buffer: Could not make EGL context current.\n");
@@ skipping 32 matching lines @@
     EGLint result = 0;
     gfGetConfigAttrib(fDisplay, static_cast<EGLConfig>(fConfig), EGL_STENCIL_SIZE, &result);
     return result;
 }
 
 int SkCommandBufferGLContext::getSampleCount() {
     EGLint result = 0;
     gfGetConfigAttrib(fDisplay, static_cast<EGLConfig>(fConfig), EGL_SAMPLES, &result);
     return result;
 }
+
+void SkCommandBufferGLContext::ReleaseGpuAPIsInThread() {
+    if (!gfFunctionsLoadedSuccessfully) {
+        return;
+    }
+    gfReleaseThread();
+}