diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2016-02-11 17:17:28 +0000 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-02-20 12:54:42 +0000 |
| commit | 8dd8bee8059da1243b20b47349fcd20ebf93df8a (patch) | |
| tree | 8cd37255d7003c63b101d047f4587dd2f4094c13 | |
| parent | fdo#94009: harfbuzz: don't export symbols from VCL (diff) | |
| download | core-8dd8bee8059da1243b20b47349fcd20ebf93df8a.tar.gz core-8dd8bee8059da1243b20b47349fcd20ebf93df8a.zip | |
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@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
(cherry picked from commit a00e445565d0cd92b32aef2bca33d054b8da1e45)
Reviewed-on: https://gerrit.libreoffice.org/22294
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
| -rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index 6aa726b8d0c1..393675bd5dd9 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() ) |