command_buffer: Add support for creating non-WebGL ES 3 contexts

gpu/command_buffer/service/context_group.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 "gpu/command_buffer/service/context_group.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 18 matching lines @@
 ContextGroup::ContextGroup(
     const scoped_refptr<MailboxManager>& mailbox_manager,
     const scoped_refptr<MemoryTracker>& memory_tracker,
     const scoped_refptr<ShaderTranslatorCache>& shader_translator_cache,
     const scoped_refptr<FramebufferCompletenessCache>&
         framebuffer_completeness_cache,
     const scoped_refptr<FeatureInfo>& feature_info,
     const scoped_refptr<SubscriptionRefSet>& subscription_ref_set,
     const scoped_refptr<ValueStateMap>& pending_valuebuffer_state,
     bool bind_generates_resource)
-    : context_type_(CONTEXT_TYPE_UNDEFINED),
+    : context_type_(CONTEXT_TYPE_OPENGLES2),
       mailbox_manager_(mailbox_manager),
       memory_tracker_(memory_tracker),
       shader_translator_cache_(shader_translator_cache),
 #if defined(OS_MACOSX)
       // Framebuffer completeness is not cacheable on OS X because of dynamic
       // graphics switching.
       // http://crbug.com/180876
       // TODO(tobiasjs): determine whether GPU switching is possible
       // programmatically, rather than just hardcoding this behaviour
       // for OS X.
@@ skipping 32 matching lines @@
     transfer_buffer_manager_ = new TransferBufferManager(memory_tracker_.get());
   }
 }
 
 static void GetIntegerv(GLenum pname, uint32* var) {
   GLint value = 0;
   glGetIntegerv(pname, &value);
   *var = value;
 }
 
-// static
-ContextGroup::ContextType ContextGroup::GetContextType(
-    unsigned webgl_version) {
-  switch (webgl_version) {
-    case 0:
-      return CONTEXT_TYPE_OTHER;
-    case 1:
-      return CONTEXT_TYPE_WEBGL1;
-    case 2:
-      return CONTEXT_TYPE_WEBGL2;
-    default:
-      return CONTEXT_TYPE_UNDEFINED;
-  }
-}
-
-bool ContextGroup::Initialize(
-    GLES2Decoder* decoder,
-    ContextGroup::ContextType context_type,
-    const DisallowedFeatures& disallowed_features) {
-  if (context_type == CONTEXT_TYPE_UNDEFINED) {
-    LOG(ERROR) << "ContextGroup::Initialize failed because of unknown "
-               << "context type.";
-    return false;
-  }
-  if (context_type_ == CONTEXT_TYPE_UNDEFINED) {
+bool ContextGroup::Initialize(GLES2Decoder* decoder,
+                              ContextType context_type,
+                              const DisallowedFeatures& disallowed_features) {
+  if (!HaveContexts()) {
     context_type_ = context_type;
   } else if (context_type_ != context_type) {
     LOG(ERROR) << "ContextGroup::Initialize failed because the type of "
                << "the context does not fit with the group.";
     return false;
   }
 
   // If we've already initialized the group just add the context.
   if (HaveContexts()) {
     decoders_.push_back(base::AsWeakPtr<GLES2Decoder>(decoder));
@@ skipping 339 matching lines @@
     GLuint client_id, GLuint* service_id) const {
   Buffer* buffer = buffer_manager_->GetBuffer(client_id);
   if (!buffer)
     return false;
   *service_id = buffer->service_id();
   return true;
 }
 
 }  // namespace gles2
 }  // namespace gpu