[Libreoffice-commits] core.git: slideshow/source

[Michael Meeks]

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

New commits:
commit d39630bb68faf190e181527ce012ad14ac77019b
Author: Michael Meeks <michael.me...@collabora.com>
Date:   Tue Sep 8 21:55:41 2015 +0100

    OpenGL: use CHECK_GL_ERROR() only when a context is bound.
    
    Change-Id: I2cdc14defe5c4bd95776206df65fd57589d40429

diff --git 
a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx 
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index a914b63..d21c52b 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -1278,8 +1278,8 @@ void SAL_CALL OGLTransitionerImpl::viewChanged( const 
Reference< presentation::X
 
 void OGLTransitionerImpl::disposeTextures()
 {
-    CHECK_GL_ERROR();
     mpContext->makeCurrent();
+    CHECK_GL_ERROR();
 
 #if defined( GLX_EXT_texture_from_pixmap )
     const GLWindow& rGLWindow(mpContext->getOpenGLWindow());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits