Call xglMakeCurrent for each command buffer to allow for multiple GL contexts...

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2009 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/gles2_cmd_decoder.h"
 
 #include <stdio.h>
 
 #include <vector>
 #include <string>
@@ skipping 468 matching lines @@
   // Overridden from AsyncAPIInterface.
   virtual ParseError DoCommand(unsigned int command,
                                unsigned int arg_count,
                                const void* args);
 
   // Overridden from AsyncAPIInterface.
   virtual const char* GetCommandName(unsigned int command_id) const;
 
   // Overridden from GLES2Decoder.
   virtual bool Initialize();
-
-  // Overridden from GLES2Decoder.
   virtual void Destroy();
-
-  // Overridden from GLES2Decoder.
+  virtual bool MakeCurrent();
   virtual uint32 GetServiceIdForTesting(uint32 client_id);
 
   // Removes any buffers in the VertexAtrribInfos and BufferInfos. This is used
   // on glDeleteBuffers so we can make sure the user does not try to render
   // with deleted buffers.
   void RemoveBufferInfo(GLuint buffer_id);
 
  private:
   bool InitPlatformSpecific();
   bool InitGlew();
@@ skipping 182 matching lines @@
       current_program_(0),
 #if defined(UNIT_TEST)
 #elif defined(OS_WIN)
       device_context_(NULL),
       gl_context_(NULL),
 #endif
       anti_aliased_(false) {
 }
 
 bool GLES2DecoderImpl::Initialize() {
+  bool success = false;
+
   id_manager_.reset(new IdManager());
   buffer_manager_.reset(new BufferManager());
   program_manager_.reset(new ProgramManager());
 
-  if (!InitPlatformSpecific())
-    return false;
-  if (!InitGlew())
-    return false;
-  CHECK_GL_ERROR();
+  if (InitPlatformSpecific()) {
+    if (MakeCurrent()) {
+      if (InitGlew()) {
+        CHECK_GL_ERROR();
 
-  // Lookup GL things we need to know.
-  GLint value;
-  glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &value);
-  max_vertex_attribs_ = value;
+        // Lookup GL things we need to know.
+        GLint value;
+        glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &value);
+        max_vertex_attribs_ = value;
 
-  DCHECK_GE(max_vertex_attribs_, 8u);
+        DCHECK_GE(max_vertex_attribs_, 8u);
 
-  vertex_attrib_infos_.reset(new VertexAttribInfo[max_vertex_attribs_]);
-  memset(vertex_attrib_infos_.get(), 0,
-         sizeof(vertex_attrib_infos_[0]) * max_vertex_attribs_);
+        vertex_attrib_infos_.reset(new VertexAttribInfo[max_vertex_attribs_]);
+        memset(vertex_attrib_infos_.get(), 0,
+               sizeof(vertex_attrib_infos_[0]) * max_vertex_attribs_);
 
-  // glBindFramebuffer(0, 0);
-  return true;
+        // glBindFramebuffer(0, 0);
+        success = true;
+      }
+    }
+  }
+
+  return success;
 }
 
 namespace {
 
 #if defined(UNIT_TEST)
 #elif defined(OS_WIN)
 
 const PIXELFORMATDESCRIPTOR kPixelFormatDescriptor = {
   sizeof(kPixelFormatDescriptor),    // Size of structure.
   1,                       // Default version.
@@ skipping 201 matching lines @@
   glDeleteRenderbuffersEXT(n, ids);
 }
 
 void GLDeleteTexturesHelper(
     GLES2DecoderImpl*, GLsizei n, GLuint* ids) {
   glDeleteTextures(n, ids);
 }
 
 }  // anonymous namespace
 
+bool GLES2DecoderImpl::MakeCurrent() {
+#if defined(UNIT_TEST)
+  return true;
+#elif defined(OS_WIN)
+  if (::wglGetCurrentDC() == device_context_ &&
+      ::wglGetCurrentContext() == gl_context_) {
+    return true;
+  }
+  if (!::wglMakeCurrent(device_context_, gl_context_)) {
+    DLOG(ERROR) << "Unable to make gl context current.";
+    return false;
+  }
+  return true;
+#elif defined(OS_LINUX)
+  return window()->MakeCurrent();
+#else
+  NOTREACHED();
+  return false;
+#endif
+}
+
 uint32 GLES2DecoderImpl::GetServiceIdForTesting(uint32 client_id) {
 #if defined(UNIT_TEST)
   GLuint service_id;
   bool result = id_manager_->GetServiceId(client_id, &service_id);
   return result ? service_id : 0u;
 #else
   DCHECK(false);
   return 0u;
 #endif
 }
@@ skipping 49 matching lines @@
                         &kPixelFormatDescriptor)) {
     DLOG(ERROR) << "Unable to set the pixel format for GL context.";
     return false;
   }
 
   gl_context_ = ::wglCreateContext(device_context_);
   if (!gl_context_) {
     DLOG(ERROR) << "Failed to create GL context.";
     return false;
   }
-
-  if (!::wglMakeCurrent(device_context_, gl_context_)) {
-    DLOG(ERROR) << "Unable to make gl context current.";
-    return false;
-  }
 #elif defined(OS_LINUX)
   DCHECK(window());
   if (!window()->Initialize())
     return false;
-  if (!window()->MakeCurrent())
-    return false;
 #endif
 
   return true;
 }
 
 bool GLES2DecoderImpl::InitGlew() {
 #if !defined(UNIT_TEST)
   DLOG(INFO) << "Initializing GL and GLEW for GLES2Decoder.";
 
   GLenum glew_error = glewInit();
@@ skipping 830 matching lines @@
   return parse_error::kParseNoError;
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu