diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-26 19:13:23 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-26 19:16:06 +0200 |
| commit | 67232b5e73df5a2a792fc274b04b52f4e9806000 (patch) | |
| tree | 00e91fe48678db8fa5d93c3d2d76f561ddb90265 /slideshow | |
| parent | 88963dcfe78972111c7906b29492a602504ebf49 (diff) | |
glew is setting up that function pointer for us
Change-Id: I1722c1d3816e6e995e71317a9c9b1529afe9df13
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index cfb1c5666ba4..19c16067d356 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx @@ -561,12 +561,10 @@ void OGLTransitionerImpl::createTexture( GLuint* texID, glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT ); #if defined( GLX_EXT_texture_from_pixmap ) - PFNGLXBINDTEXIMAGEEXTPROC myglXBindTexImageEXT = (PFNGLXBINDTEXIMAGEEXTPROC) glXGetProcAddress( (const GLubyte*) "glXBindTexImageEXT" ); - if( usePixmap ) { if( mbGenerateMipmap ) glTexParameteri( GL_TEXTURE_2D, GL_GENERATE_MIPMAP_SGIS, True); - myglXBindTexImageEXT (mpContext->getOpenGLWindow().dpy, pixmap, GLX_FRONT_LEFT_EXT, NULL); + glXBindTexImageEXT (mpContext->getOpenGLWindow().dpy, pixmap, GLX_FRONT_LEFT_EXT, NULL); if( mbGenerateMipmap && useMipmap ) { SAL_INFO("slideshow.opengl", "use mipmaps"); glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR); @@ -1234,9 +1232,8 @@ void OGLTransitionerImpl::disposeTextures() #if defined( GLX_EXT_texture_from_pixmap ) GLWindow& rGLWindow(mpContext->getOpenGLWindow()); - PFNGLXRELEASETEXIMAGEEXTPROC myglXReleaseTexImageEXT = (PFNGLXRELEASETEXIMAGEEXTPROC) glXGetProcAddress( (const GLubyte*) "glXReleaseTexImageEXT" ); if( mbUseLeavingPixmap ) { - myglXReleaseTexImageEXT( rGLWindow.dpy, maLeavingPixmapGL, GLX_FRONT_LEFT_EXT ); + glXReleaseTexImageEXT( rGLWindow.dpy, maLeavingPixmapGL, GLX_FRONT_LEFT_EXT ); glXDestroyGLXPixmap( rGLWindow.dpy, maLeavingPixmapGL ); maLeavingPixmapGL = 0; if( mbFreeLeavingPixmap ) { @@ -1246,7 +1243,7 @@ void OGLTransitionerImpl::disposeTextures() } } if( mbUseEnteringPixmap ) { - myglXReleaseTexImageEXT( rGLWindow.dpy, maEnteringPixmapGL, GLX_FRONT_LEFT_EXT ); + glXReleaseTexImageEXT( rGLWindow.dpy, maEnteringPixmapGL, GLX_FRONT_LEFT_EXT ); glXDestroyGLXPixmap( rGLWindow.dpy, maEnteringPixmapGL ); maEnteringPixmapGL = 0; if( mbFreeEnteringPixmap ) { |