diff options
| author | Emmanuel Gil Peyrot <emmanuel.peyrot@collabora.com> | 2015-12-09 21:39:21 +0000 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2015-12-11 15:28:59 +0100 |
| commit | f9a0564fb900764485f5e44c9b01a467022b792f (patch) | |
| tree | 864ea079919b792d02108293c5b9cd8b027303a4 /slideshow/source/engine | |
| parent | 878be3cff28b11779347e694c1c3078759c68b5a (diff) | |
slideshow: Remove wrong and unused uniform upload
Change-Id: I13c91af15caad888b4b56dbf92b63fdb0a97b47d
Diffstat (limited to 'slideshow/source/engine')
| -rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx index ab44f3dca01c..94ded57c0a3e 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx @@ -465,18 +465,8 @@ void SimpleTransition::displaySlides_( double nTime, sal_Int32 glLeavingSlideTex CHECK_GL_ERROR(); applyOverallOperations( nTime, SlideWidthScale, SlideHeightScale ); - glActiveTexture( GL_TEXTURE2 ); - glBindTexture( GL_TEXTURE_2D, glEnteringSlideTex ); - glActiveTexture( GL_TEXTURE0 ); - - GLint location = -1; - if( m_nProgramObject ) - location = glGetUniformLocation( m_nProgramObject, "slideTexture" ); - if( location != -1 ) - glUniform1f( location, 2 ); + CHECK_GL_ERROR(); displaySlide( nTime, glLeavingSlideTex, getScene().getLeavingSlide(), SlideWidthScale, SlideHeightScale ); - if( location != -1 ) - glUniform1f( location, 0 ); displaySlide( nTime, glEnteringSlideTex, getScene().getEnteringSlide(), SlideWidthScale, SlideHeightScale ); CHECK_GL_ERROR(); } |