diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-07 11:43:07 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-06-14 12:41:29 +0000 |
| commit | d42caf438cf240c0ad1f803320f9063d6108a0aa (patch) | |
| tree | 056f81c9920151d90f5461f4e678fbacf5b44391 /src/core/gl_surface_qt.cpp | |
| parent | 917f862ebfd0a1797786c7c663acb83ff9144cde (diff) | |
Simple adaptations for Chromium 58
Change-Id: I7c2c85973b03fdbd2eafb5339f33a3758d53e924
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/gl_surface_qt.cpp')
| -rw-r--r-- | src/core/gl_surface_qt.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
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<GLXFBConfig>(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; } |