summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-09-08 21:25:17 +0100
committerMichael Meeks <michael.meeks@collabora.com>2015-09-08 21:27:29 +0100
commita37d3b1c5cc1186142ab75c7cb15f4bbf07f8435 (patch)
treec022e8ce15c6a1c3fadebe35a6801a49f9d83ead /slideshow
parent1553ace0a46c2659540dbf746aa862ccbb160ffd (diff)
OpenGL: use CHECK_GL_ERROR() only when a context is bound.
Removes a large number of spurious GL errors left & right. Change-Id: I0b5639478812982b39d3b88be2600dad5d3f1fd0
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 5ac45f376eb9..a914b63a3dfe 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)
{