VisualBench: Use first succeeding EGL API

platform_tools/android/apps/visualbench/src/main/jni/SkOSWindow_AndroidNative.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 "SkOSWindow_Android.h"
 
 #include <GLES/gl.h>
@@ skipping 32 matching lines @@
             EGL_OPENGL_API,
             EGL_OPENGL_BIT,
         },
         {   // OpenGL ES. This seems to work for both ES2 and 3 (when available).
             kEGLContextAttribsForOpenGLES,
             EGL_OPENGL_ES_API,
             EGL_OPENGL_ES2_BIT,
         },
     };
 
-    size_t apiLimit = SK_ARRAY_COUNT(kAPIs);
+    EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+    if (EGL_NO_DISPLAY == display) {
+        return false;
+    }
 
-    for (size_t api = 0; api < apiLimit; ++api) {
-        EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+    EGLint majorVersion;
+    EGLint minorVersion;
+    if (!eglInitialize(display, &majorVersion, &minorVersion)) {
+        return false;
+    }
 
-        EGLint majorVersion;
-        EGLint minorVersion;
-        eglInitialize(display, &majorVersion, &minorVersion);
-
+    for (size_t api = 0; api < SK_ARRAY_COUNT(kAPIs); ++api) {
+        if (!eglBindAPI(kAPIs[api].fAPI)) {
+            continue;
+        }
 #if 0
         SkDebugf("VENDOR: %s\n", eglQueryString(fDisplay, EGL_VENDOR));
         SkDebugf("APIS: %s\n", eglQueryString(fDisplay, EGL_CLIENT_APIS));
         SkDebugf("VERSION: %s\n", eglQueryString(fDisplay, EGL_VERSION));
         SkDebugf("EXTENSIONS %s\n", eglQueryString(fDisplay, EGL_EXTENSIONS));
 #endif
 
-        if (!eglBindAPI(kAPIs[api].fAPI)) {
-            continue;
-        }
-
         const EGLint configAttribs[] = {
             EGL_SURFACE_TYPE, EGL_PBUFFER_BIT,
             EGL_RENDERABLE_TYPE, kAPIs[api].fRenderableTypeBit,
             EGL_RED_SIZE, 8,
             EGL_GREEN_SIZE, 8,
             EGL_BLUE_SIZE, 8,
             EGL_ALPHA_SIZE, 8,
             EGL_NONE
         };
 
         EGLint format;
         EGLint numConfigs;
         EGLConfig config;
         EGLSurface surface;
         EGLContext context;
 
         /* Here, the application chooses the configuration it desires. In this
          * sample, we have a very simplified selection process, where we pick
          * the first EGLConfig that matches our criteria */
-        eglChooseConfig(display, configAttribs, &config, 1, &numConfigs);
+        if (!eglChooseConfig(display, configAttribs, &config, 1, &numConfigs) ||
+            numConfigs != 1) {
+            continue;
+        }
 
         /* EGL_NATIVE_VISUAL_ID is an attribute of the EGLConfig that is
          * guaranteed to be accepted by ANativeWindow_setBuffersGeometry().
          * As soon as we picked a EGLConfig, we can safely reconfigure the
          * ANativeWindow buffers to match, using EGL_NATIVE_VISUAL_ID. */
-        eglGetConfigAttrib(display, config, EGL_NATIVE_VISUAL_ID, &format);
+        if (!eglGetConfigAttrib(display, config, EGL_NATIVE_VISUAL_ID, &format)) {
+            continue;
+        }
 
         ANativeWindow_setBuffersGeometry(fNativeWindow, 0, 0, format);
 
         surface = eglCreateWindowSurface(display, config, fNativeWindow, nullptr);
+        if (EGL_NO_SURFACE == surface) {
+            SkDebugf("eglCreateWindowSurface failed.  EGL Error: 0x%08x\n", eglGetError());
+            continue;
+        }
         context = eglCreateContext(display, config, nullptr, kAPIs[api].fContextAttribs);
         if (EGL_NO_CONTEXT == context) {
             SkDebugf("eglCreateContext failed.  EGL Error: 0x%08x\n", eglGetError());
+            eglDestroySurface(display, surface);
             continue;
         }
 
         if (!eglMakeCurrent(display, surface, surface, context)) {
             SkDebugf("eglMakeCurrent failed.  EGL Error: 0x%08x\n", eglGetError());
+            eglDestroyContext(display, context);
+            eglDestroySurface(display, surface);
             continue;
         }
 
         fWindow.fDisplay = display;
         fWindow.fContext = context;
         fWindow.fSurface = surface;
+        break;
     }
 
     if (fWindow.fDisplay && fWindow.fContext && fWindow.fSurface) {
         EGLint w, h;
         eglQuerySurface(fWindow.fDisplay, fWindow.fSurface, EGL_WIDTH, &w);
         eglQuerySurface(fWindow.fDisplay, fWindow.fSurface, EGL_HEIGHT, &h);
 
         glViewport(0, 0, w, h);
         glClearColor(0.0, 0, 0, 0.0);
         glClearStencil(0);
@@ skipping 51 matching lines @@
 
 ///////////////////////////////////////////
 /////////////// SkEvent impl //////////////
 ///////////////////////////////////////////
 
 void SkEvent::SignalQueueTimer(SkMSec ms) {
 }
 
 void SkEvent::SignalNonEmptyQueue() {
 }