Revert of Refactor context creation parameters into a struct.

ui/gl/gl_context_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 "ui/gl/gl_context_egl.h"
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "third_party/khronos/EGL/egl.h"
 #include "third_party/khronos/EGL/eglext.h"
 #include "ui/gl/egl_util.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_surface_egl.h"
 
 #if defined(USE_X11)
 extern "C" {
 #include <X11/Xlib.h>
 }
 #endif
 
-#ifndef EGL_CHROMIUM_create_context_bind_generates_resource
-#define EGL_CHROMIUM_create_context_bind_generates_resource 1
-#define EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM 0x3AAD
-#endif /* EGL_CHROMIUM_create_context_bind_generates_resource */
-
-#ifndef EGL_ANGLE_create_context_webgl_compatibility
-#define EGL_ANGLE_create_context_webgl_compatibility 1
-#define EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE 0x3AAC
-#endif /* EGL_ANGLE_create_context_webgl_compatibility */
-
 using ui::GetLastEGLErrorString;
 
 namespace gl {
 
 GLContextEGL::GLContextEGL(GLShareGroup* share_group)
     : GLContextReal(share_group),
       context_(nullptr),
       display_(nullptr),
       config_(nullptr),
       unbind_fbo_on_makecurrent_(false),
       swap_interval_(1) {
 }
 
-bool GLContextEGL::Initialize(GLSurface* compatible_surface,
-                              const GLContextAttribs& attribs) {
+bool GLContextEGL::Initialize(
+    GLSurface* compatible_surface, GpuPreference gpu_preference) {
   DCHECK(compatible_surface);
   DCHECK(!context_);
 
   display_ = compatible_surface->GetDisplay();
   config_ = compatible_surface->GetConfig();
 
   EGLint config_renderable_type = 0;
   if (!eglGetConfigAttrib(display_, config_, EGL_RENDERABLE_TYPE,
                           &config_renderable_type)) {
     LOG(ERROR) << "eglGetConfigAttrib failed with error "
                << GetLastEGLErrorString();
     return false;
   }
 
   EGLint context_client_version = 2;
   if ((config_renderable_type & EGL_OPENGL_ES3_BIT) != 0 &&
       !base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableES3GLContext)) {
     context_client_version = 3;
   }
 
-  std::vector<EGLint> context_attributes;
-  context_attributes.push_back(EGL_CONTEXT_CLIENT_VERSION);
-  context_attributes.push_back(context_client_version);
+  const EGLint kContextAttributes[] = {
+    EGL_CONTEXT_CLIENT_VERSION, context_client_version,
+    EGL_NONE
+  };
+  const EGLint kContextRobustnessAttributes[] = {
+    EGL_CONTEXT_CLIENT_VERSION, context_client_version,
+    EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT,
+    EGL_LOSE_CONTEXT_ON_RESET_EXT,
+    EGL_NONE
+  };
 
+  const EGLint* context_attributes = nullptr;
   if (GLSurfaceEGL::IsCreateContextRobustnessSupported()) {
     DVLOG(1) << "EGL_EXT_create_context_robustness supported.";
+    context_attributes = kContextRobustnessAttributes;
   } else {
     // At some point we should require the presence of the robustness
     // extension and remove this code path.
     DVLOG(1) << "EGL_EXT_create_context_robustness NOT supported.";
-    context_attributes.push_back(
-        EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT);
-    context_attributes.push_back(EGL_LOSE_CONTEXT_ON_RESET_EXT);
+    context_attributes = kContextAttributes;
   }
 
   if (!eglBindAPI(EGL_OPENGL_ES_API)) {
     LOG(ERROR) << "eglBindApi failed with error "
                << GetLastEGLErrorString();
     return false;
   }
 
-  if (GLSurfaceEGL::IsCreateContextBindGeneratesResourceSupported()) {
-    context_attributes.push_back(EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM);
-    context_attributes.push_back(attribs.bind_generates_resource ? EGL_TRUE
-                                                                 : EGL_FALSE);
-  } else {
-    DCHECK(attribs.bind_generates_resource);
-  }
-
-  if (GLSurfaceEGL::IsCreateContextWebGLCompatabilitySupported()) {
-    context_attributes.push_back(EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE);
-    context_attributes.push_back(
-        attribs.webgl_compatibility_context ? EGL_TRUE : EGL_FALSE);
-  } else {
-    DCHECK(!attribs.webgl_compatibility_context);
-  }
-
-  // Append final EGL_NONE to signal the context attributes are finished
-  context_attributes.push_back(EGL_NONE);
-  context_attributes.push_back(EGL_NONE);
-
   context_ = eglCreateContext(
-      display_, config_, share_group() ? share_group()->GetHandle() : nullptr,
-      context_attributes.data());
+      display_,
+      config_,
+      share_group() ? share_group()->GetHandle() : nullptr,
+      context_attributes);
 
   if (!context_) {
     LOG(ERROR) << "eglCreateContext failed with error "
                << GetLastEGLErrorString();
     return false;
   }
 
   return true;
 }
 
@@ skipping 119 matching lines @@
 
 bool GLContextEGL::WasAllocatedUsingRobustnessExtension() {
   return GLSurfaceEGL::IsCreateContextRobustnessSupported();
 }
 
 GLContextEGL::~GLContextEGL() {
   Destroy();
 }
 
 }  // namespace gl