vcl/inc/openglgdiimpl.hxx | 2 ++ vcl/opengl/gdiimpl.cxx | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-)
New commits: commit bafb52624869a5078636a462a06fd65b9efaf04b Author: Caolán McNamara <[email protected]> Date: Thu Jan 26 12:17:58 2017 +0000 Related: tdf#105514 recursive fallback GetOpenGLContext Change-Id: Icb8f3751806ef9c1c7c92cd8b7cc7c28595eca22 Reviewed-on: https://gerrit.libreoffice.org/33580 Tested-by: Jenkins <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> (cherry picked from commit 9a61fdbf0b64dac30a2fe098388cd20471cca7bb) Reviewed-on: https://gerrit.libreoffice.org/33747 Reviewed-by: Miklos Vajna <[email protected]> diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx index 1457004..e12d781 100644 --- a/vcl/inc/openglgdiimpl.hxx +++ b/vcl/inc/openglgdiimpl.hxx @@ -83,6 +83,8 @@ protected: bool mbXORMode; + bool mbAcquiringOpenGLContext; + /** * All rendering happens to this off-screen texture. For * non-virtual devices, ie. windows - we will blit it and diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx index b487468..47fa5d3 100644 --- a/vcl/opengl/gdiimpl.cxx +++ b/vcl/opengl/gdiimpl.cxx @@ -76,6 +76,7 @@ OpenGLSalGraphicsImpl::OpenGLSalGraphicsImpl(SalGraphics& rParent, SalGeometryPr , mbUseScissor(false) , mbUseStencil(false) , mbXORMode(false) + , mbAcquiringOpenGLContext(false) , mnLineColor(SALCOLOR_NONE) , mnFillColor(SALCOLOR_NONE) #ifdef DBG_UTIL @@ -101,7 +102,12 @@ OpenGLSalGraphicsImpl::~OpenGLSalGraphicsImpl() rtl::Reference<OpenGLContext> OpenGLSalGraphicsImpl::GetOpenGLContext() { - if( !AcquireContext(true) ) + if (mbAcquiringOpenGLContext) + return nullptr; + mbAcquiringOpenGLContext = true; + bool bSuccess = AcquireContext(true); + mbAcquiringOpenGLContext = false; + if (!bSuccess) return nullptr; return mpContext; }
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
