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

ui/gl/gl_surface.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 UI_GL_GL_SURFACE_H_
 #define UI_GL_GL_SURFACE_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "build/build_config.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 #include "ui/gl/gl_export.h"
 
 namespace gfx {
 
 class GLContext;
+class GLContextReal;
+class VirtualGLApi;
 class VSyncProvider;
 
 // Encapsulates a surface that can be rendered to with GL, hiding platform
 // specific management.
 class GL_EXPORT GLSurface : public base::RefCounted<GLSurface> {
  public:
   GLSurface();
 
   // (Re)create the surface. TODO(apatrick): This is an ugly hack to allow the
   // EGL surface associated to be recreated without destroying the associated
@@ skipping 71 matching lines @@
   // Create a GL surface that renders directly to a view.
   static scoped_refptr<GLSurface> CreateViewGLSurface(
       bool software,
       gfx::AcceleratedWidget window);
 
   // Create a GL surface used for offscreen rendering.
   static scoped_refptr<GLSurface> CreateOffscreenGLSurface(
       bool software,
       const gfx::Size& size);
 
+  // Returns the last GLSurface made current, virtual or real.
   static GLSurface* GetCurrent();
 
  protected:
   virtual ~GLSurface();
   static bool InitializeOneOffInternal();
   static void SetCurrent(GLSurface* surface);
+  static void SetRealCurrent(GLSurface* surface);
 
   static bool ExtensionsContain(const char* extensions, const char* name);
 
+  // Returns the last GLSurface made current with a real (non-virtual) context.
+  static GLSurface* GetRealCurrent();

[no sievers, 2013/06/05 16:43:37]

...and do we then really need to track this separately?

[jonathan.backer, 2013/06/05 20:40:11]

Nope. I think that the DCHECK in gl_gl_api_implementation.cc was too
restrictive. Nuked it.

+
  private:
   friend class base::RefCounted<GLSurface>;
   friend class GLContext;
 
+  // For GetRealCurrent.
+  friend class VirtualGLApi;
+
+  // For SetRealCurrent.
+  friend class GLContextReal;
+
   DISALLOW_COPY_AND_ASSIGN(GLSurface);
 };
 
 // Implementation of GLSurface that forwards all calls through to another
 // GLSurface.
 class GL_EXPORT GLSurfaceAdapter : public GLSurface {
  public:
   explicit GLSurfaceAdapter(GLSurface* surface);
 
   virtual bool Initialize() OVERRIDE;
@@ skipping 24 matching lines @@
 
  private:
   scoped_refptr<GLSurface> surface_;
 
   DISALLOW_COPY_AND_ASSIGN(GLSurfaceAdapter);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GL_GL_SURFACE_H_