GPU: Keep track of the last real context and real surface made current.

ui/gl/gl_gl_api_implementation.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_gl_api_implementation.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 236 matching lines @@
   if (it != ext.end())
     ext.erase(it);
 
   extensions_ = JoinString(ext, " ");
 }
 
 bool VirtualGLApi::MakeCurrent(GLContext* virtual_context, GLSurface* surface) {
   bool switched_contexts = g_current_gl_context != this;
   GLSurface* current_surface = GLSurface::GetCurrent();
   if (switched_contexts || surface != current_surface) {
-    if (!switched_contexts && current_surface &&
-        virtual_context->IsCurrent(surface)) {
-      // MakeCurrent 'lite' path that avoids potentially expensive MakeCurrent()
-      // calls if the GLSurface uses the same underlying surface or renders to
-      // an FBO.
-      if (!surface->OnMakeCurrent(real_context_)) {
-        LOG(ERROR) << "Could not make GLSurface current.";
+    // MakeCurrent 'lite' path that avoids potentially expensive MakeCurrent()
+    // calls if the GLSurface uses the same underlying surface or renders to
+    // an FBO.
+    if (switched_contexts || !current_surface ||
+        !virtual_context->IsCurrent(surface)) {
+      if (!real_context_->MakeCurrent(surface)) {
         return false;
       }
-    } else if (!real_context_->MakeCurrent(surface)) {
-      return false;
     }
   }
 
-  DCHECK(GLSurface::GetCurrent());
-  DCHECK(real_context_->IsCurrent(GLSurface::GetCurrent()));
+  DCHECK_EQ(real_context_, GLContext::GetRealCurrent());
+  DCHECK(real_context_->IsCurrent(NULL));
   DCHECK(virtual_context->IsCurrent(surface));
 
   if (switched_contexts || virtual_context != current_context_) {
     // There should be no errors from the previous context leaking into the
     // new context.
     DCHECK_EQ(glGetErrorFn(), static_cast<GLenum>(GL_NO_ERROR));
 
     current_context_ = virtual_context;
     // Set all state that is different from the real state
     // NOTE: !!! This is a temporary implementation that just restores all
     // state to let us test that it works.
     // TODO: ASAP, change this to something that only restores the state
     // needed for individual GL calls.
     GLApi* temp = GetCurrentGLApi();
     SetGLToRealGLApi();
     if (virtual_context->GetGLStateRestorer()->IsInitialized())
       virtual_context->GetGLStateRestorer()->RestoreState();
     SetGLApi(temp);
   }
   SetGLApi(this);
+
+  virtual_context->SetCurrent(surface);
+  if (!surface->OnMakeCurrent(virtual_context)) {
+    LOG(ERROR) << "Could not make GLSurface current.";
+    return false;
+  }
   return true;
 }
 
 void VirtualGLApi::OnReleaseVirtuallyCurrent(GLContext* virtual_context) {
   if (current_context_ == virtual_context)
     current_context_ = NULL;
 }
 
 const GLubyte* VirtualGLApi::glGetStringFn(GLenum name) {
   switch (name) {
     case GL_EXTENSIONS:
       return reinterpret_cast<const GLubyte*>(extensions_.c_str());
     default:
       return driver_->fn.glGetStringFn(name);
   }
 }
 
 }  // namespace gfx