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

[Michael Meeks]

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

New commits:
commit 8dd8bee8059da1243b20b47349fcd20ebf93df8a
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Thu Feb 11 17:17:28 2016 +0000

    tdf#97197 - GL transitions should use their context not VCL's.
    
    Change-Id: Ifab7da221e73e068ebe0856a4224ec4ca4d611b5
    Reviewed-on: https://gerrit.libreoffice.org/22293
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit a00e445565d0cd92b32aef2bca33d054b8da1e45)
    Reviewed-on: https://gerrit.libreoffice.org/22294
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 6aa726b..393675b 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -374,7 +374,9 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta
     }
     SAL_INFO("slideshow", "created the context");
 
+    mpContext->makeCurrent();
     CHECK_GL_ERROR();
+
     awt::Rectangle aCanvasArea = mxView->getCanvasArea();
     mpContext->setWinPosAndSize(Point(aCanvasArea.X, aCanvasArea.Y), Size(aCanvasArea.Width, aCanvasArea.Height));
     SAL_INFO("slideshow.opengl", "canvas area: " << aCanvasArea.X << "," << aCanvasArea.Y << " - " << aCanvasArea.Width << "x" << aCanvasArea.Height);
@@ -551,6 +553,9 @@ bool OGLTransitionerImpl::setTransition( std::shared_ptr<OGLTransitionImpl> pTra
 
     mpTransition = pTransition;
 
+    mpContext->makeCurrent();
+    CHECK_GL_ERROR();
+
     bool succeeded = impl_prepareTransition();
     if (!succeeded) {
         mpTransition = nullptr;
@@ -1288,6 +1293,9 @@ void OGLTransitionerImpl::disposeTextures()
 
 void OGLTransitionerImpl::impl_dispose()
 {
+    mpContext->makeCurrent();
+    CHECK_GL_ERROR();
+
     impl_finishTransition();
     disposeTextures();
     if( mpContext.is() )