slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 3 ++- vcl/opengl/gdiimpl.cxx | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-)
New commits: commit a37d3b1c5cc1186142ab75c7cb15f4bbf07f8435 Author: Michael Meeks <michael.me...@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 diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index 5ac45f3..a914b63 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) { diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx index 5487347..21208b3 100644 --- a/vcl/opengl/gdiimpl.cxx +++ b/vcl/opengl/gdiimpl.cxx @@ -1863,9 +1863,9 @@ void OpenGLSalGraphicsImpl::endPaint() mpContext->AcquireDefaultFramebuffer(); glFlush(); mpContext->swapBuffers(); - } - CHECK_GL_ERROR(); + CHECK_GL_ERROR(); + } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits