Skip to content

C
core
Kaydet (Commit) f9a0564f authored tarafından Emmanuel Gil Peyrot's avatar Emmanuel Gil Peyrot Kaydeden (comit) Tomaž Vajngerl
Dosyalara gözat
Seçenekler

slideshow: Remove wrong and unused uniform upload 

Change-Id: I13c91af15caad888b4b56dbf92b63fdb0a97b47d
üst 878be3cf
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 11 deletions
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
Dosyayı görüntüle @ f9a0564f
...@@ -465,18 +465,8 @@ void SimpleTransition::displaySlides_( double nTime, sal_Int32 glLeavingSlideTex ...@@ -465,18 +465,8 @@ void SimpleTransition::displaySlides_( double nTime, sal_Int32 glLeavingSlideTex
CHECK_GL_ERROR(); CHECK_GL_ERROR();
applyOverallOperations( nTime, SlideWidthScale, SlideHeightScale ); applyOverallOperations( nTime, SlideWidthScale, SlideHeightScale );
glActiveTexture( GL_TEXTURE2 ); CHECK_GL_ERROR();
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 );
displaySlide( nTime, glLeavingSlideTex, getScene().getLeavingSlide(), SlideWidthScale, SlideHeightScale ); displaySlide( nTime, glLeavingSlideTex, getScene().getLeavingSlide(), SlideWidthScale, SlideHeightScale );
if( location != -1 )
glUniform1f( location, 0 );
displaySlide( nTime, glEnteringSlideTex, getScene().getEnteringSlide(), SlideWidthScale, SlideHeightScale ); displaySlide( nTime, glEnteringSlideTex, getScene().getEnteringSlide(), SlideWidthScale, SlideHeightScale );
CHECK_GL_ERROR(); CHECK_GL_ERROR();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment