mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accidental commit? We don't wanna comment these out for no reason.

Browse Source
This commit is contained in:
Kohei Yoshida
2010-12-12 14:17:22 -05:00
parent 8f1dd190d1
commit 74b49ef3af
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
View File

@@ -1205,10 +1205,10 @@ void OGLTransitionImpl::preparePermShader()
OGLShaders::glUniform1i( location, 0 ); // texture unit 0 OGLShaders::glUniform1i( location, 0 ); // texture unit 0
} }
//glActiveTexture(GL_TEXTURE1); glActiveTexture(GL_TEXTURE1);
if( !maHelperTexture ) if( !maHelperTexture )
initPermTexture( &maHelperTexture ); initPermTexture( &maHelperTexture );
//glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
location = OGLShaders::glGetUniformLocation( mProgramObject, "permTexture" ); location = OGLShaders::glGetUniformLocation( mProgramObject, "permTexture" );
if( location != -1 ) { if( location != -1 ) {
@@ -1243,9 +1243,9 @@ void OGLTransitionImpl::displaySlidesShaders( double nTime, ::sal_Int32 glLeavin
} }
} }
//glActiveTexture( GL_TEXTURE2 ); glActiveTexture( GL_TEXTURE2 );
glBindTexture( GL_TEXTURE_2D, glEnteringSlideTex ); glBindTexture( GL_TEXTURE_2D, glEnteringSlideTex );
//glActiveTexture( GL_TEXTURE0 ); glActiveTexture( GL_TEXTURE0 );
#endif #endif
displaySlide( nTime, glLeavingSlideTex, maLeavingSlidePrimitives, SlideWidthScale, SlideHeightScale ); displaySlide( nTime, glLeavingSlideTex, maLeavingSlidePrimitives, SlideWidthScale, SlideHeightScale );