Change Details

From 013dfab48ba6c9699fbffe57394bc647cc6af5e8 Mon Sep 17 00:00:00 2001 From: David Edmundson <davidedmundson@kde.org> Date: Mon, 2 Apr 2018 19:50:27 +0100 Subject: [PATCH] Get graphics reset status for offscreen surfaces This clears any errors --- src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp index 86ca7afa12..93ec8fcc8d 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp @@ -547,6 +547,8 @@ bool QGLXContext::makeCurrent(QPlatformSurface *surface) QGLXPbuffer *pbuffer = static_cast<QGLXPbuffer *>(surface); glxDrawable = pbuffer->pbuffer(); success = glXMakeContextCurrent(m_display, glxDrawable, glxDrawable, m_context); + if (m_getGraphicsResetStatus) + m_getGraphicsResetStatus(); } if (success && surfaceClass == QSurface::Window) { -- 2.16.2

commit 8c519a742a264d4ed2b1252953eebbdeeb56adf0 (HEAD -> 5.11) Author: David Edmundson <davidedmundson@kde.org> Date: Mon Apr 2 19:50:27 2018 +0100 Get graphics reset status for offscreen surfaces diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp index 86ca7afa12..c41fe5f186 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp @@ -547,6 +547,10 @@ bool QGLXContext::makeCurrent(QPlatformSurface *surface) QGLXPbuffer *pbuffer = static_cast<QGLXPbuffer *>(surface); glxDrawable = pbuffer->pbuffer(); success = glXMakeContextCurrent(m_display, glxDrawable, glxDrawable, m_context); + m_lost = false; + if (m_getGraphicsResetStatus && m_getGraphicsResetStatus() != GL_NO_ERROR) { + m_lost = true; + } } if (success && surfaceClass == QSurface::Window) {

From 013dfab48ba6c9699fbffe57394bc647cc6af5e8 Mon Sep 17 00:00:00 2001 From: David Edmundson <davidedmundson@kde.org>commit 8c519a742a264d4ed2b1252953eebbdeeb56adf0 (HEAD -> 5.11) Date: Mon, 2 Apr 2018 19:50:27 +0100Author: David Edmundson <davidedmundson@kde.org> Subject: [PATCH] Get graphics reset status for offscreen surfacesDate: Mon Apr 2 19:50:27 2018 +0100 This clears any errors --- src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp | 2 ++ 1 file changed, 2 insertions(+) Get graphics reset status for offscreen surfaces diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp index 86ca7afa12..93ec8fcc8dc41fe5f186 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp @@ -547,6 +547,810 @@ bool QGLXContext::makeCurrent(QPlatformSurface *surface) QGLXPbuffer *pbuffer = static_cast<QGLXPbuffer *>(surface); glxDrawable = pbuffer->pbuffer(); success = glXMakeContextCurrent(m_display, glxDrawable, glxDrawable, m_context); + m_lost = false; + if (m_getGraphicsResetStatus && m_getGraphicsResetStatus() != GL_NO_ERROR) { + if (m_getGraphicsResetStatus) m_lost = true; + m_getGraphicsResetStatus();} } if (success && surfaceClass == QSurface::Window) { -- 2.16.2