summaryrefslogtreecommitdiff
path: root/vcl/source/opengl
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-09-04 16:44:25 +0300
committerTor Lillqvist <tml@collabora.com>2015-09-04 16:58:16 +0300
commit091723f7fd012cb3b6896c5559c5f235bbaec513 (patch)
tree49b66f6c5c6ce8daa9d2f60ba7afe94d969e8fbb /vcl/source/opengl
parentb14cdcbf6834461f6f079c153fc7d32402c28236 (diff)
Avoid a SAL_INFO about OpenGL when not using OpenGL
Change-Id: Ia066c240776cecc855b59ab0ccc84e7fdcbf4b79
Diffstat (limited to 'vcl/source/opengl')
-rw-r--r--vcl/source/opengl/OpenGLContext.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 3c305d523d98..b1212fdfca4a 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -1340,11 +1340,16 @@ void OpenGLContext::prepareForYield()
{
ImplSVData* pSVData = ImplGetSVData();
- SAL_INFO("vcl.opengl", "Unbinding contexts in preparation for yield");
// release all framebuffers from the old context so we can re-attach the
// texture in the new context
OpenGLContext* pCurrentCtx = pSVData->maGDIData.mpLastContext;
- if( pCurrentCtx && pCurrentCtx->isCurrent() )
+
+ if ( !pCurrentCtx )
+ return; // Not using OpenGL
+
+ SAL_INFO("vcl.opengl", "Unbinding contexts in preparation for yield");
+
+ if( pCurrentCtx->isCurrent() )
pCurrentCtx->resetCurrent();
assert (!hasCurrent());