ooo-build r13745 - in trunk: . patches/dev300

[rodo svn gnome org]

Author: rodo
Date: Mon Sep  1 17:04:11 2008
New Revision: 13745
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13745&view=rev

Log:
2008-09-01  Radek Doulik  <rodo novell com>

	*patches/dev300/apply: added transogl-buildfix-pixmap-ext.diff
	with changes below
	
	* slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx:
	check for pixmap to texture extension at build time as well



Added:
   trunk/patches/dev300/transogl-buildfix-pixmap-ext.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Sep  1 17:04:11 2008
@@ -1799,6 +1799,7 @@
 transogl-buildfix.diff
 transogl-pixmap-to-texture.diff
 transogl-fix-dual-head.diff
+transogl-buildfix-pixmap-ext.diff
 
 [ Experimental ]
 # sal_uInt32 -> sal_uIntPtr for events on some places

Added: trunk/patches/dev300/transogl-buildfix-pixmap-ext.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/transogl-buildfix-pixmap-ext.diff	Mon Sep  1 17:04:11 2008
@@ -0,0 +1,138 @@
+diff -rup slideshow/source/engine/OGLTrans-orig-2/OGLTrans_TransitionerImpl.cxx slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx
+--- slideshow/source/engine/OGLTrans-orig-2/OGLTrans_TransitionerImpl.cxx	2008-09-01 17:42:13.000000000 +0200
++++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx	2008-09-01 18:55:36.000000000 +0200
+@@ -170,7 +170,7 @@ protected:
+ 
+     bool createWindow( Window* pPWindow );
+     void createTexture( unsigned int* texID,
+-#ifdef GLX_VERSION_1_3
++#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
+ 			unx::GLXPixmap pixmap,
+ 			bool usePixmap,
+ #endif
+@@ -199,7 +199,7 @@ private:
+ 	unx::Display*           dpy;
+ 	int                     screen;
+ 	unx::Window             win;
+-#ifdef GLX_VERSION_1_3
++#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
+ 	unx::GLXFBConfig        fbc;
+ #endif
+ 	unx::XVisualInfo*       vi;
+@@ -237,7 +237,7 @@ private:
+     */
+     uno::Sequence<sal_Int8> LeavingBytes;
+ 
+-#ifdef GLX_VERSION_1_3
++#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
+     unx::GLXPixmap LeavingPixmap;
+     unx::GLXPixmap EnteringPixmap;
+ #endif
+@@ -352,7 +352,7 @@ bool OGLTransitionerImpl::createWindow(
+     GLWin.screen = XScreenNumberOfScreen( xattr.screen );
+ 
+     unx::XVisualInfo* vi( NULL );
+-#ifdef GLX_VERSION_1_3
++#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
+     unx::XVisualInfo* visinfo;
+ #endif
+     static int attrList3[] =
+@@ -408,7 +408,7 @@ bool OGLTransitionerImpl::createWindow(
+     delete pWindow;
+     pWindow=NULL;
+ 
+-#ifdef GLX_VERSION_1_3
++#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
+     unx::GLXFBConfig* fbconfigs = NULL;
+     int nfbconfigs, value, i = 0;
+ #endif
+@@ -420,7 +420,7 @@ bool OGLTransitionerImpl::createWindow(
+                                    GLWin.screen,
+                                    *pAttributeTable );
+ 
+-#ifdef GLX_VERSION_1_3
++#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
+       if( vi ) {
+ 	  OSL_TRACE("OGLTrans: using VisualID %08X", vi->visualid);
+           fbconfigs = glXGetFBConfigs (GLWin.dpy, GLWin.screen, &nfbconfigs);
+@@ -472,7 +472,7 @@ bool OGLTransitionerImpl::createWindow(
+                   delete pWindow, pWindow=NULL;
+               }
+           }
+-#ifdef GLX_VERSION_1_3
++#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
+       }
+ #endif
+ 
+@@ -505,7 +505,7 @@ bool OGLTransitionerImpl::createWindow(
+ #elif defined( UNX )
+         GLWin.dpy = reinterpret_cast<unx::Display*>(pChildSysData->pDisplay);
+         GLWin.win = pChildSysData->aWindow;
+-#ifdef GLX_VERSION_1_3
++#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
+ 	GLWin.fbc = fbconfigs[i];
+ #endif
+ 	GLWin.vi = vi;
+@@ -677,7 +677,7 @@ void OGLTransitionerImpl::setSlides( con
+     mbUseEnteringPixmap = false;
+ 
+ #ifdef UNX
+-#ifdef GLX_VERSION_1_3
++#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
+ 
+     if( mnGLXVersion >= 1.2999 && mbTextureFromPixmap && xLeavingSet.is() && xEnteringSet.is() ) {
+ 	Sequence< Any > leaveArgs;
+@@ -779,7 +779,7 @@ void OGLTransitionerImpl::setSlides( con
+ }
+ 
+ void OGLTransitionerImpl::createTexture( unsigned int* texID,
+-#ifdef GLX_VERSION_1_3
++#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
+ 					 unx::GLXPixmap pixmap,
+ 					 bool usePixmap,
+ #endif
+@@ -793,7 +793,7 @@ void OGLTransitionerImpl::createTexture(
+     glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT );
+     glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT );
+ 
+-#ifdef GLX_VERSION_1_3
++#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
+     unx::PFNGLXBINDTEXIMAGEEXTPROC myglXBindTexImageEXT = (unx::PFNGLXBINDTEXIMAGEEXTPROC) unx::glXGetProcAddress( (const GLubyte*) "glXBindTexImageEXT" );
+ 
+     if( usePixmap ) {
+@@ -847,7 +847,7 @@ void OGLTransitionerImpl::createTexture(
+ 	    glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, largest_supported_anisotropy );
+ 	}
+     }
+-#ifdef GLX_VERSION_1_3
++#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
+     }
+ #endif
+     OSL_ENSURE(glIsTexture(*texID), "Can't generate Leaving slide textures in OpenGL");
+@@ -1013,7 +1013,7 @@ void OGLTransitionerImpl::GLInitSlides()
+ 	pFormat = chooseFormats();
+ 
+     createTexture( &GLleavingSlide,
+-#ifdef GLX_VERSION_1_3
++#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
+ 		   LeavingPixmap,
+ 		   mbUseLeavingPixmap,
+ #endif
+@@ -1022,7 +1022,7 @@ void OGLTransitionerImpl::GLInitSlides()
+ 		   pFormat );
+ 
+     createTexture( &GLenteringSlide,
+-#ifdef GLX_VERSION_1_3
++#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
+ 		   EnteringPixmap,
+ 		   mbUseEnteringPixmap,
+ #endif
+@@ -1104,7 +1104,7 @@ void OGLTransitionerImpl::disposing()
+     glXMakeCurrent( GLWin.dpy, GLWin.win, GLWin.ctx );
+ #endif
+ 
+-#ifdef GLX_VERSION_1_3
++#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
+     unx::PFNGLXRELEASETEXIMAGEEXTPROC myglXReleaseTexImageEXT = (unx::PFNGLXRELEASETEXIMAGEEXTPROC) unx::glXGetProcAddress( (const GLubyte*) "glXReleaseTexImageEXT" );
+     if( mbUseLeavingPixmap ) {
+