diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-08-12 06:44:03 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-08-12 06:44:03 +0200 |
| commit | 886e4edf59d212d88d50024e1bfe3664d3fc03c3 (patch) | |
| tree | 1e263ce91cfd4c3ea066966568585586ebe87724 /slideshow | |
| parent | d280b13b88abe71ed8f06b08d0b1179ddfcf9c63 (diff) | |
let us use OpenGL types for OpenGL resources
Change-Id: I53dbbfb2f1d721bdbb076fa7cb45801659694a14
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index 7b97215b8859..f90ddc8e0cba 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx @@ -198,7 +198,7 @@ protected: return (rBHelper.bDisposed || rBHelper.bInDispose); } - void createTexture( unsigned int* texID, + void createTexture( GLuint* texID, #if defined( GLX_EXT_texture_from_pixmap ) GLXPixmap pixmap, bool usePixmap, @@ -232,10 +232,10 @@ private: /** OpenGL handle to the leaving slide's texture */ - unsigned int maLeavingSlideGL; + GLuint maLeavingSlideGL; /** OpenGL handle to the entering slide's texture */ - unsigned int maEnteringSlideGL; + GLuint maEnteringSlideGL; Reference< presentation::XSlideShowView > mxView; Reference< rendering::XIntegerBitmap > mxLeavingBitmap; @@ -561,7 +561,7 @@ void OGLTransitionerImpl::setTransition( boost::shared_ptr<OGLTransitionImpl> co impl_prepareTransition(); } -void OGLTransitionerImpl::createTexture( unsigned int* texID, +void OGLTransitionerImpl::createTexture( GLuint* texID, #if defined( GLX_EXT_texture_from_pixmap ) GLXPixmap pixmap, bool usePixmap, |