summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubosz Sarnecki <lubosz.sarnecki@collabora.co.uk>2015-09-11 14:48:26 +0200
committerMichael Meeks <michael.meeks@collabora.com>2015-09-12 21:06:44 +0000
commit2857674b3c1b42ca1cd2f87a74e2cf92bf461f55 (patch)
tree5098bfed167c30a149a2e9b9a153ca4e9ccd7f3f
parentb6f31e1025d658f15ed8280225c4b5c032639629 (diff)
tdf#94031 - slideshow: bind correct GL context for prepareEnvironment
Change-Id: Ib139e81f770531f7d808764dd3a77c7ac8d6fa3c Signed-off-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/18508 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
-rw-r--r--slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index f468f8742f42..db5097083cc6 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -1185,6 +1185,7 @@ void OGLTransitionerImpl::GLInitSlides()
TimerContext aTimerContext("texture creation");
#endif
+ mpContext->makeCurrent();
prepareEnvironment();
const OGLFormat* pFormat = NULL;