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

[Michael Meeks]

 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |    5 +++--
 vcl/opengl/gdiimpl.cxx                                                 |    4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit c055dd615b17198b37e98ed3f832246ca8fbf5ee
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue Sep 8 21:25:17 2015 +0100

    OpenGL: use CHECK_GL_ERROR() only when a context is bound.
    
    Removes a large number of spurious GL errors left & right.
    
    Change-Id: I0b5639478812982b39d3b88be2600dad5d3f1fd0
    Reviewed-on: https://gerrit.libreoffice.org/18422
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Reviewed-on: https://gerrit.libreoffice.org/18446
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 9f2b60b..f468f87 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -1230,11 +1230,12 @@ void SAL_CALL OGLTransitionerImpl::update( double nTime ) throw (uno::RuntimeExc
     if (isDisposed() || !mbValidOpenGLContext || mpTransition->getSettings().mnRequiredGLVersion > mnGLVersion)
         return;
 
-    CHECK_GL_ERROR();
     mpContext->makeCurrent();
+    CHECK_GL_ERROR();
 
     glEnable(GL_DEPTH_TEST);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    CHECK_GL_ERROR();
 
     if(mpTransition)
     {
@@ -1277,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());
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index b3c9ea2..85c3a3a 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -1880,9 +1880,9 @@ void OpenGLSalGraphicsImpl::endPaint()
         mpContext->AcquireDefaultFramebuffer();
         glFlush();
         mpContext->swapBuffers();
-    }
 
-    CHECK_GL_ERROR();
+        CHECK_GL_ERROR();
+    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */