Android: Use virtualized context only for those with compatible config

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/callback.h"
@@ skipping 20 matching lines @@
 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();
 
   // Minimum bit depth of surface.
   enum Format {
-    SURFACE_ARGB8888 = 1, // 32 bits
-    SURFACE_RGB565 = 2,  // 16 bits
+    SURFACE_ARGB8888,
+    SURFACE_RGB565,
     SURFACE_DEFAULT = SURFACE_ARGB8888
   };
 
   // (Re)create the surface. TODO(apatrick): This is an ugly hack to allow the
   // EGL surface associated to be recreated without destroying the associated
   // context. The implementation of this function for other GLSurface derived
   // classes is in a pending changelist.
   virtual bool Initialize();
   virtual bool Initialize(GLSurface::Format format);
 
@@ skipping 91 matching lines @@
   // if this is not possible.
   virtual void* GetShareHandle();
 
   // Get the platform specific display on which this surface resides, if
   // available.
   virtual void* GetDisplay();
 
   // Get the platfrom specific configuration for this surface, if available.
   virtual void* GetConfig();
 
+  // Get the default format of the surface.
+  virtual GLSurface::Format GetDefaultFormat() const;

[no sievers, 2016/02/18 20:19:45]

This is not needed anymore, right? Because how we use this is specific to
Android, it'd be nice not to expose too much of it everywhere.

[Jinsuk Kim, 2016/02/19 01:04:40]

Removed.

+
   // Get the GL pixel format of the surface, if available.
-  virtual unsigned GetFormat();
+  virtual GLSurface::Format GetFormat();
 
   // Get access to a helper providing time of recent refresh and period
   // of screen refresh. If unavailable, returns NULL.
   virtual VSyncProvider* GetVSyncProvider();
 
   // Schedule an overlay plane to be shown at swap time, or on the next
   // CommitOverlayPlanes call.
   // |z_order| specifies the stacking order of the plane relative to the
   // main framebuffer located at index 0. For the case where there is no
   // main framebuffer, overlays may be scheduled at 0, taking its place.
@@ skipping 38 matching lines @@
   // Create a GL surface that renders directly into a window with surfaceless
   // semantics - there is no default framebuffer and the primary surface must
   // be presented as an overlay. If surfaceless mode is not supported or
   // enabled it will return a null pointer.
   static scoped_refptr<GLSurface> CreateSurfacelessViewGLSurface(
       gfx::AcceleratedWidget window);
 #endif  // defined(USE_OZONE)
 
   // Create a GL surface used for offscreen rendering.
   static scoped_refptr<GLSurface> CreateOffscreenGLSurface(
-      const gfx::Size& size) {
-    return CreateOffscreenGLSurface(size, SURFACE_DEFAULT);
-  }
-
-  static scoped_refptr<GLSurface> CreateOffscreenGLSurface(
-      const gfx::Size& size, GLSurface::Format format);
+      const gfx::Size& size);
 
   static GLSurface* GetCurrent();
 
   // Called when the swap interval for the associated context changes.
   virtual void OnSetSwapInterval(int interval);
 
  protected:
   virtual ~GLSurface();
   static bool InitializeOneOffImplementation(GLImplementation impl,
                                              bool fallback_to_osmesa,
                                              bool gpu_service_logging,
                                              bool disable_gl_drawing);
   static bool InitializeOneOffInternal();
   static void SetCurrent(GLSurface* surface);
 
   static bool ExtensionsContain(const char* extensions, const char* name);
 
+  GLSurface::Format format_;
+
  private:
   friend class base::RefCounted<GLSurface>;
   friend class GLContext;
   friend class GLSurfaceTestSupport;
 
   DISALLOW_COPY_AND_ASSIGN(GLSurface);
 };
 
 // Implementation of GLSurface that forwards all calls through to another
 // GLSurface.
@@ skipping 25 matching lines @@
   bool SupportsAsyncSwap() override;
   gfx::Size GetSize() override;
   void* GetHandle() override;
   unsigned int GetBackingFrameBufferObject() override;
   bool OnMakeCurrent(GLContext* context) override;
   bool SetBackbufferAllocation(bool allocated) override;
   void SetFrontbufferAllocation(bool allocated) override;
   void* GetShareHandle() override;
   void* GetDisplay() override;
   void* GetConfig() override;
-  unsigned GetFormat() override;
+  GLSurface::Format GetFormat() override;
   VSyncProvider* GetVSyncProvider() override;
   bool ScheduleOverlayPlane(int z_order,
                             OverlayTransform transform,
                             gl::GLImage* image,
                             const Rect& bounds_rect,
                             const RectF& crop_rect) override;
   bool IsSurfaceless() const override;
   bool FlipsVertically() const override;
   bool BuffersFlipped() const override;
 
   GLSurface* surface() const { return surface_.get(); }
 
  protected:
   ~GLSurfaceAdapter() override;
 
  private:
   scoped_refptr<GLSurface> surface_;
 
   DISALLOW_COPY_AND_ASSIGN(GLSurfaceAdapter);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GL_GL_SURFACE_H_