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

let us use OpenGL types for OpenGL resources

Browse Source 
Change-Id: I53dbbfb2f1d721bdbb076fa7cb45801659694a14
This commit is contained in:
Markus Mohrhard
2014-08-12 06:44:03 +02:00
parent d280b13b88
commit 886e4edf59
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/generic/OGLTrans_TransitionerImpl.cxx
View File

@@ -198,7 +198,7 @@ protected:
return (rBHelper.bDisposed || rBHelper.bInDispose); return (rBHelper.bDisposed || rBHelper.bInDispose);
} }
void createTexture( unsigned int* texID, void createTexture( GLuint* texID,
#if defined( GLX_EXT_texture_from_pixmap ) #if defined( GLX_EXT_texture_from_pixmap )
GLXPixmap pixmap, GLXPixmap pixmap,
bool usePixmap, bool usePixmap,
@@ -232,10 +232,10 @@ private:
/** OpenGL handle to the leaving slide's texture /** OpenGL handle to the leaving slide's texture
*/ */
unsigned int maLeavingSlideGL; GLuint maLeavingSlideGL;
/** OpenGL handle to the entering slide's texture /** OpenGL handle to the entering slide's texture
*/ */
unsigned int maEnteringSlideGL; GLuint maEnteringSlideGL;
Reference< presentation::XSlideShowView > mxView; Reference< presentation::XSlideShowView > mxView;
Reference< rendering::XIntegerBitmap > mxLeavingBitmap; Reference< rendering::XIntegerBitmap > mxLeavingBitmap;
@@ -561,7 +561,7 @@ void OGLTransitionerImpl::setTransition( boost::shared_ptr<OGLTransitionImpl> co
impl_prepareTransition(); impl_prepareTransition();
} }
void OGLTransitionerImpl::createTexture( unsigned int* texID, void OGLTransitionerImpl::createTexture( GLuint* texID,
#if defined( GLX_EXT_texture_from_pixmap ) #if defined( GLX_EXT_texture_from_pixmap )
GLXPixmap pixmap, GLXPixmap pixmap,
bool usePixmap, bool usePixmap,