diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-10-16 12:26:14 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-16 20:21:42 +0200 |
| commit | 8efdbd9a55a753b7c3b7588da234d8eac1b0e3cf (patch) | |
| tree | 8dcd911ec8216d704fd72c85ab7cb9f54c266ec5 /vcl | |
| parent | ec2f188f3d89cbcfc555781db34fb7fe8c51c656 (diff) | |
Related: tdf#124729 log any gtk_gl_area_get_error messages
Change-Id: I5864e5d3132b309d5500c02a8493062abcb25aab
Reviewed-on: https://gerrit.libreoffice.org/80886
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkinst.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 3928e498ba35..f178acd4fc5a 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -1424,6 +1424,12 @@ private: int allocheight = std::max(height, 1); gtk_gl_area_make_current(GTK_GL_AREA(m_pGLArea)); + if (GError *pError = gtk_gl_area_get_error(GTK_GL_AREA(m_pGLArea))) + { + SAL_WARN("vcl.gtk", "gtk gl area error: " << pError->message); + return; + } + glBindRenderbuffer(GL_RENDERBUFFER, m_nRenderBuffer); glRenderbufferStorage(GL_RENDERBUFFER, GL_RGB8, allocwidth, allocheight); glBindRenderbuffer(GL_RENDERBUFFER, m_nDepthBuffer); @@ -1475,9 +1481,11 @@ private: gtk_widget_show_all(pParent); gtk_gl_area_make_current(GTK_GL_AREA(m_pGLArea)); - - if (gtk_gl_area_get_error(GTK_GL_AREA(m_pGLArea))) + if (GError *pError = gtk_gl_area_get_error(GTK_GL_AREA(m_pGLArea))) + { + SAL_WARN("vcl.gtk", "gtk gl area error: " << pError->message); return false; + } gtk_gl_area_attach_buffers(GTK_GL_AREA(m_pGLArea)); glGenFramebuffersEXT(1, &m_nAreaFrameBuffer); |