[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-2' - slideshow/source

Sat, 12 Sep 2015 14:07:24 -0700 

 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2857674b3c1b42ca1cd2f87a74e2cf92bf461f55
Author: Lubosz Sarnecki <[email protected]>
Date:   Fri Sep 11 14:48:26 2015 +0200

    tdf#94031 - slideshow: bind correct GL context for prepareEnvironment
    
    Change-Id: Ib139e81f770531f7d808764dd3a77c7ac8d6fa3c
    Signed-off-by: Michael Meeks <[email protected]>
    Reviewed-on: https://gerrit.libreoffice.org/18508
    Reviewed-by: Markus Mohrhard <[email protected]>
    Reviewed-by: Tomaž Vajngerl <[email protected]>

diff --git 
a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx 
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index f468f87..db50970 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;

_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to