From d42caf438cf240c0ad1f803320f9063d6108a0aa Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 7 Apr 2017 11:43:07 +0200 Subject: Simple adaptations for Chromium 58 Change-Id: I7c2c85973b03fdbd2eafb5339f33a3758d53e924 Reviewed-by: Peter Varga --- src/core/gl_surface_qt.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/core/gl_surface_qt.cpp') diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp index 4eefc0008..a09196220 100644 --- a/src/core/gl_surface_qt.cpp +++ b/src/core/gl_surface_qt.cpp @@ -260,6 +260,7 @@ bool GLSurfaceQtGLX::Initialize(GLSurfaceFormat format) }; m_surfaceBuffer = glXCreatePbuffer(display, static_cast(g_config), pbuffer_attributes); + m_format = format; if (!m_surfaceBuffer) { Destroy(); @@ -329,6 +330,7 @@ bool GLSurfaceQtWGL::InitializeOneOff() bool GLSurfaceQtWGL::Initialize(GLSurfaceFormat format) { m_surfaceBuffer = new PbufferGLSurfaceWGL(m_size); + m_format = format; return m_surfaceBuffer->Initialize(format); } @@ -463,6 +465,7 @@ bool GLSurfaceQtEGL::Initialize(GLSurfaceFormat format) { Q_UNUSED(format); Q_ASSERT(!m_surfaceBuffer); + m_format = format; EGLDisplay display = g_display; if (!display) { @@ -517,6 +520,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) @@ -562,8 +571,9 @@ GLSurfacelessQtEGL::GLSurfacelessQtEGL(const gfx::Size& size) { } -bool GLSurfacelessQtEGL::Initialize(GLSurfaceFormat /*format*/) +bool GLSurfacelessQtEGL::Initialize(GLSurfaceFormat format) { + m_format = format; return true; } -- cgit v1.2.3