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

gpu/command_buffer/tests/gl_manager.h

 // 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.
 
 #ifndef GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_
 #define GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_
 
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 27 matching lines @@
 class GLES2Decoder;
 class GLES2CmdHelper;
 class GLES2Implementation;
 class ImageManager;
 class ShareGroup;
 
 };
 
 class GLManager : private GpuControl {
  public:
+  enum ContextType {

[Zhenyao Mo, 2015/08/28 17:16:25]

Can we not redefine this, but instead, use the one defined in gles2_cmd_util.h?

[Kimmo Kinnunen, 2015/08/31 12:23:13]

Done.

+    CONTEXT_TYPE_WEBGL1,
+    CONTEXT_TYPE_WEBGL2,
+    CONTEXT_TYPE_OPENGLES2,
+    CONTEXT_TYPE_OPENGLES3
+  };
   struct Options {
     Options();
     // The size of the backbuffer.
     gfx::Size size;
     // If not null will share resources with this context.
     GLManager* share_group_manager;
     // If not null will share a mailbox manager with this context.
     GLManager* share_mailbox_manager;
     // If not null will create a virtual manager based on this context.
     GLManager* virtual_manager;
     // Whether or not glBindXXX generates a resource.
     bool bind_generates_resource;
     // Whether or not the context is auto-lost when GL_OUT_OF_MEMORY occurs.
     bool lose_context_when_out_of_memory;
     // Whether or not it's ok to lose the context.
     bool context_lost_allowed;
-    // 0 indicates not WebGL context - default.
-    // 1 indicates WebGL 1 context.
-    // 2 indicates WebGL 2 context.
-    unsigned webgl_version;
+
+    ContextType context_type;
   };
   GLManager();
   ~GLManager() override;
 
   static scoped_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBuffer(
       const gfx::Size& size,
       gfx::BufferFormat format);
 
   void Initialize(const Options& options);
   void InitializeWithCommandLine(const Options& options,
                                  base::CommandLine* command_line);
   void Destroy();
 
+  bool IsInitialized() const { return gles2_implementation() != nullptr; }
+
   void MakeCurrent();
 
   void SetSurface(gfx::GLSurface* surface);
 
   gles2::GLES2Decoder* decoder() const {
     return decoder_.get();
   }
 
   gles2::MailboxManager* mailbox_manager() const {
     return mailbox_manager_.get();
@@ skipping 55 matching lines @@
   // Used on Android to virtualize GL for all contexts.
   static int use_count_;
   static scoped_refptr<gfx::GLShareGroup>* base_share_group_;
   static scoped_refptr<gfx::GLSurface>* base_surface_;
   static scoped_refptr<gfx::GLContext>* base_context_;
 };
 
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_