1 files changed, 50 insertions, 16 deletions

diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp
index a18e22b58..f731b0231 100644
--- a/src/core/gl_surface_qt.cpp
+++ b/src/core/gl_surface_qt.cpp
@@ -103,7 +103,7 @@ public:
 
     static bool InitializeOneOff();
 
-    bool Initialize() override;
+    bool Initialize(GLSurfaceFormat format) override;
     void Destroy() override;
     void* GetHandle() override;
     bool Resize(const gfx::Size& size, float scale_factor, bool has_alpha) override;
@@ -125,7 +125,7 @@ public:
     explicit GLSurfacelessQtEGL(const gfx::Size& size);
 
  public:
-    bool Initialize() override;
+    bool Initialize(GLSurfaceFormat format) override;
     void Destroy() override;
     bool IsSurfaceless() const override;
     bool Resize(const gfx::Size& size, float scale_factor, bool has_alpha) override;
@@ -153,7 +153,7 @@ public:
 
     static bool InitializeOneOff();
 
-    bool Initialize() override;
+    bool Initialize(GLSurfaceFormat format) override;
     void Destroy() override;
     void* GetHandle() override;
 
@@ -180,6 +180,16 @@ bool GLSurfaceGLX::IsCreateContextRobustnessSupported()
     return false; // ExtensionsContain(g_extensions, "GLX_ARB_create_context_robustness");
 }
 
+bool GLSurfaceGLX::IsEXTSwapControlSupported()
+{
+    return HasGLXExtension("GLX_EXT_swap_control");
+}
+
+bool GLSurfaceGLX::IsMESASwapControlSupported()
+{
+    return HasGLXExtension("GLX_MESA_swap_control");
+}
+
 bool GLSurfaceGLX::IsCreateContextProfileSupported()
 {
     return false; // ExtensionsContain(g_extensions, "GLX_ARB_create_context_profile");
@@ -247,7 +257,7 @@ bool GLSurfaceQtGLX::InitializeOneOff()
     return true;
 }
 
-bool GLSurfaceQtGLX::Initialize()
+bool GLSurfaceQtGLX::Initialize(GLSurfaceFormat format)
 {
     Q_ASSERT(!m_surfaceBuffer);
 
@@ -261,6 +271,7 @@ bool GLSurfaceQtGLX::Initialize()
     };
 
     m_surfaceBuffer = glXCreatePbuffer(display, static_cast<GLXFBConfig>(g_config), pbuffer_attributes);
+    m_format = format;
 
     if (!m_surfaceBuffer) {
         Destroy();
@@ -297,7 +308,7 @@ public:
 
     static bool InitializeOneOff();
 
-    bool Initialize() override;
+    bool Initialize(GLSurfaceFormat format) override;
     void Destroy() override;
     void *GetHandle() override;
     void *GetDisplay() override;
@@ -327,11 +338,12 @@ bool GLSurfaceQtWGL::InitializeOneOff()
     return GLSurfaceWGL::InitializeOneOff();
 }
 
-bool GLSurfaceQtWGL::Initialize()
+bool GLSurfaceQtWGL::Initialize(GLSurfaceFormat format)
 {
     m_surfaceBuffer = new PbufferGLSurfaceWGL(m_size);
+    m_format = format;
 
-    return m_surfaceBuffer->Initialize(gl::GLSurface::SURFACE_DEFAULT);
+    return m_surfaceBuffer->Initialize(format);
 }
 
 void GLSurfaceQtWGL::Destroy()
@@ -426,6 +438,15 @@ bool GLSurfaceEGL::IsCreateContextWebGLCompatabilitySupported()
     return false;
 }
 
+bool GLSurfaceEGL::IsEGLContextPrioritySupported()
+{
+    return false;
+}
+
+void GLSurfaceEGL::ShutdownOneOff()
+{
+}
+
 const char* GLSurfaceEGL::GetEGLExtensions()
 {
     return g_extensions;
@@ -436,6 +457,11 @@ bool GLSurfaceEGL::HasEGLExtension(const char* name)
     return ExtensionsContain(GetEGLExtensions(), name);
 }
 
+bool GLSurfaceEGL::InitializeOneOff(EGLNativeDisplayType /*native_display*/)
+{
+    return GLSurfaceQtEGL::InitializeOneOff();
+}
+
 GLSurfaceQt::GLSurfaceQt(const gfx::Size& size)
     : m_size(size)
 {
@@ -456,9 +482,10 @@ GLSurfaceQtEGL::GLSurfaceQtEGL(const gfx::Size& size)
 {
 }
 
-bool GLSurfaceQtEGL::Initialize()
+bool GLSurfaceQtEGL::Initialize(GLSurfaceFormat format)
 {
     Q_ASSERT(!m_surfaceBuffer);
+    m_format = format;
 
     EGLDisplay display = g_display;
     if (!display) {
@@ -513,6 +540,12 @@ gfx::Size GLSurfaceQt::GetSize()
 }
 
 
+GLSurfaceFormat GLSurfaceQt::GetFormat()
+{
+    return m_format;
+}
+
+
 bool GLSurfaceQtEGL::Resize(const gfx::Size& size, float scale_factor, bool has_alpha)
 {
     if (size == m_size)
@@ -527,7 +560,7 @@ bool GLSurfaceQtEGL::Resize(const gfx::Size& size, float scale_factor, bool has_
 
     m_size = size;
 
-    if (!Initialize()) {
+    if (!Initialize(GetFormat())) {
         LOG(ERROR) << "Failed to resize pbuffer.";
         return false;
     }
@@ -558,8 +591,9 @@ GLSurfacelessQtEGL::GLSurfacelessQtEGL(const gfx::Size& size)
 {
 }
 
-bool GLSurfacelessQtEGL::Initialize()
+bool GLSurfacelessQtEGL::Initialize(GLSurfaceFormat format)
 {
+    m_format = format;
     return true;
 }
 
@@ -625,7 +659,7 @@ bool usingSoftwareDynamicGL()
 }
 
 scoped_refptr<GLSurface>
-CreateOffscreenGLSurface(const gfx::Size& size)
+CreateOffscreenGLSurfaceWithFormat(const gfx::Size& size, GLSurfaceFormat format)
 {
     scoped_refptr<GLSurface> surface;
     switch (GetGLImplementation()) {
@@ -633,13 +667,13 @@ CreateOffscreenGLSurface(const gfx::Size& size)
     case kGLImplementationDesktopGL: {
 #if defined(OS_WIN)
         surface = new GLSurfaceQtWGL(size);
-        if (surface->Initialize())
+        if (surface->Initialize(format))
             return surface;
         break;
 #elif defined(USE_X11)
         if (!g_initializedEGL) {
             surface = new GLSurfaceQtGLX(size);
-            if (surface->Initialize())
+            if (surface->Initialize(format))
                 return surface;
         }
         // no break
@@ -647,7 +681,7 @@ CreateOffscreenGLSurface(const gfx::Size& size)
     }
     case kGLImplementationEGLGLES2: {
         surface = new GLSurfaceQtEGL(size);
-        if (surface->Initialize())
+        if (surface->Initialize(format))
             return surface;
 
         // Surfaceless context will be used ONLY if pseudo surfaceless context
@@ -655,7 +689,7 @@ CreateOffscreenGLSurface(const gfx::Size& size)
         // have problems. (e.g. QTBUG-57290)
         if (g_egl_surfaceless_context_supported) {
             surface = new GLSurfacelessQtEGL(size);
-            if (surface->Initialize())
+            if (surface->Initialize(format))
                 return surface;
         }
         LOG(WARNING) << "Failed to create offscreen GL surface";
@@ -695,7 +729,7 @@ namespace gpu {
 class GpuCommandBufferStub;
 class GpuChannelManager;
 scoped_refptr<gl::GLSurface> ImageTransportSurface::CreateNativeSurface(base::WeakPtr<ImageTransportSurfaceDelegate>,
-                                                                        SurfaceHandle, gl::GLSurface::Format)
+                                                                        SurfaceHandle, gl::GLSurfaceFormat)
 {
     QT_NOT_USED
     return scoped_refptr<gl::GLSurface>();