Add command_buffer_gles2

gpu/gles2_conform_support/egl/egl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <EGL/egl.h>
 
 #include "base/command_line.h"
 #include "gpu/command_buffer/client/gles2_lib.h"
 #include "gpu/gles2_conform_support/egl/display.h"
 #include "ui/gl/gl_context.h"
@@ skipping 84 matching lines @@
 }
 
 EGLBoolean eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor) {
   if (dpy == EGL_NO_DISPLAY)
     return EglError(EGL_BAD_DISPLAY, EGL_FALSE);
 
   egl::Display* display = static_cast<egl::Display*>(dpy);
   if (!display->Initialize())
     return EglError(EGL_NOT_INITIALIZED, EGL_FALSE);
 
-  int argc = 1;
-  const char* const argv[] = {
-    "dummy"
-  };
-  base::CommandLine::Init(argc, argv);
-  gfx::GLSurface::InitializeOneOff();
+  // eglInitialze can be called multiple times, prevent InitializeOneOff from

[no sievers, 2015/08/27 19:21:28]

nit: s/eglInitialze/eglInitialize

[hendrikw, 2015/08/27 20:34:44]

Done.

+  // being called multiple times.

[no sievers, 2015/08/27 19:21:28]

Actually InitializeOneOff() already seems to handle being called multiple times,
see gl_surface_glx/egl/wgl.cc

[hendrikw, 2015/08/27 20:34:44]

It DCHECKS if called more than once because of DCHECK_EQ(kGLImplementationNone,
GetGLImplementation()), and in
InitializeStaticGLBindings, it dchecks a second time.

The DCHECK is there to prevent the initialization from changing GL
implementations in tests, but in my case, it prevents InitializeOneOff from
being called multiple times.

For my use case, wiring this off should be fine.

+  if (gfx::GetGLImplementation() == gfx::kGLImplementationNone) {
+    int argc = 1;
+    const char* const argv[] = {
+      "dummy"
+    };
+    base::CommandLine::Init(argc, argv);
+    gfx::GLSurface::InitializeOneOff();
+  }
 
   *major = 1;
   *minor = 4;
   return EglSuccess(EGL_TRUE);
 }
 
 EGLBoolean eglTerminate(EGLDisplay dpy) {
   EGLint error_code = ValidateDisplay(dpy);
   if (error_code != EGL_SUCCESS)
     return EglError(error_code, EGL_FALSE);
@@ skipping 300 matching lines @@
   return EGL_FALSE;
 }
 
 /* Now, define eglGetProcAddress using the generic function ptr. type */
 __eglMustCastToProperFunctionPointerType
 eglGetProcAddress(const char* procname) {
   return reinterpret_cast<__eglMustCastToProperFunctionPointerType>(
       gles2::GetGLFunctionPointer(procname));
 }
 }  // extern "C"