Remove workarounds initializing command buffer EGL

tools/gpu/gl/command_buffer/GLTestContext_command_buffer.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 "SkMutex.h"
 #include "SkOnce.h"
@@ skipping 122 matching lines @@
 }
 
 static const GrGLInterface* create_command_buffer_interface() {
     load_command_buffer_once();
     if (!gfFunctionsLoadedSuccessfully) {
         return nullptr;
     }
     return GrGLAssembleGLESInterface(gLibrary, command_buffer_get_gl_proc);
 }
 
-// We use a poor man's garbage collector of EGLDisplays. They are only
-// terminated when there are no more EGLDisplays in use. See crbug.com/603223
-SK_DECLARE_STATIC_MUTEX(gDisplayMutex);
-static int gActiveDisplayCnt;
-SkTArray<EGLDisplay> gRetiredDisplays;
-
-static EGLDisplay get_and_init_display() {
-    SkAutoMutexAcquire am(gDisplayMutex);
-    EGLDisplay dsp = gfGetDisplay(EGL_DEFAULT_DISPLAY);
-    if (dsp == EGL_NO_DISPLAY) {
-        return EGL_NO_DISPLAY;
-    }
-    EGLint major, minor;
-    if (!gfInitialize(dsp, &major, &minor)) {
-        gRetiredDisplays.push_back(dsp);
-        return EGL_NO_DISPLAY;
-    }
-    ++gActiveDisplayCnt;
-    return dsp;
-}
-
-static void retire_display(EGLDisplay dsp) {
-    if (dsp == EGL_NO_DISPLAY) {
-        return;
-    }
-    SkAutoMutexAcquire am(gDisplayMutex);
-    gRetiredDisplays.push_back(dsp);
-    --gActiveDisplayCnt;
-    if (!gActiveDisplayCnt) {
-        for (EGLDisplay d : gRetiredDisplays) {
-            gfTerminate(d);
-        }
-        gRetiredDisplays.reset();
-    }
-}
 }  // anonymous namespace
 
 namespace sk_gpu_test {
 
 CommandBufferGLTestContext::CommandBufferGLTestContext()
     : fContext(EGL_NO_CONTEXT), fDisplay(EGL_NO_DISPLAY), fSurface(EGL_NO_SURFACE) {
 
     static const EGLint configAttribs[] = {
         EGL_SURFACE_TYPE, EGL_PBUFFER_BIT,
         EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
@@ skipping 37 matching lines @@
 void CommandBufferGLTestContext::initializeGLContext(void *nativeWindow, const int *configAttribs,
                                                  const int *surfaceAttribs) {
     load_command_buffer_once();
     if (!gfFunctionsLoadedSuccessfully) {
         SkDebugf("Command Buffer: Could not load EGL functions.\n");
         return;
     }
 
     // Make sure CHROMIUM_path_rendering is enabled for NVPR support.
     sk_setenv("CHROME_COMMAND_BUFFER_GLES2_ARGS", "--enable-gl-path-rendering");
-    fDisplay = get_and_init_display();
+    fDisplay = gfGetDisplay(EGL_DEFAULT_DISPLAY);
     if (EGL_NO_DISPLAY == fDisplay) {
         SkDebugf("Command Buffer: Could not create EGL display.\n");
         return;
     }
-
+    if (!gfInitialize(fDisplay, nullptr, nullptr)) {
+        SkDebugf("Command Buffer: Could not initialize EGL display.\n");
+        this->destroyGLContext();
+        return;
+    }
     EGLint numConfigs;
     if (!gfChooseConfig(fDisplay, configAttribs, static_cast<EGLConfig *>(&fConfig), 1,
                         &numConfigs) || numConfigs != 1) {
         SkDebugf("Command Buffer: Could not choose EGL config.\n");
         this->destroyGLContext();
         return;
     }
 
     if (nativeWindow) {
         fSurface = gfCreateWindowSurface(fDisplay,
@@ skipping 45 matching lines @@
 
 CommandBufferGLTestContext::~CommandBufferGLTestContext() {
     this->teardown();
     this->destroyGLContext();
 }
 
 void CommandBufferGLTestContext::destroyGLContext() {
     if (!gfFunctionsLoadedSuccessfully) {
         return;
     }
-    if (fDisplay) {
-        gfMakeCurrent(fDisplay, 0, 0, 0);
+    if (EGL_NO_DISPLAY == fDisplay) {
+        return;
+    }
+    if (EGL_NO_CONTEXT != fContext) {
+        gfDestroyContext(fDisplay, fContext);
+        fContext = EGL_NO_CONTEXT;
+    }
+    // Call MakeCurrent after destroying the context, so that the EGL implementation knows that
+    // the context is not used anymore after it is released from being current.  This way
+    // command buffer does not need to abandon the context before destruction, and no
+    // client-side errors are printed.
+    gfMakeCurrent(fDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
 
-        if (fContext) {
-            gfDestroyContext(fDisplay, fContext);
-            fContext = EGL_NO_CONTEXT;
-        }
-
-        if (fSurface) {
-            gfDestroySurface(fDisplay, fSurface);
-            fSurface = EGL_NO_SURFACE;
-        }
-
-        retire_display(fDisplay);
-        fDisplay = EGL_NO_DISPLAY;
+    if (EGL_NO_SURFACE != fSurface) {
+        gfDestroySurface(fDisplay, fSurface);
+        fSurface = EGL_NO_SURFACE;
     }
+    fDisplay = EGL_NO_DISPLAY;
 }
 
 void CommandBufferGLTestContext::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 @@
     return result;
 }
 
 int CommandBufferGLTestContext::getSampleCount() {
     EGLint result = 0;
     gfGetConfigAttrib(fDisplay, static_cast<EGLConfig>(fConfig), EGL_SAMPLES, &result);
     return result;
 }
 
 }  // namespace sk_gpu_test