ooo-build r13165 - trunk/patches/dev300

[brosenk svn gnome org]

Author: brosenk
Date: Fri Jul 11 17:49:31 2008
New Revision: 13165
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13165&view=rev

Log:
Adapt to changes in other patches


Modified:
   trunk/patches/dev300/transogl-mesa-fallback.diff

Modified: trunk/patches/dev300/transogl-mesa-fallback.diff
==============================================================================
--- trunk/patches/dev300/transogl-mesa-fallback.diff	(original)
+++ trunk/patches/dev300/transogl-mesa-fallback.diff	Fri Jul 11 17:49:31 2008
@@ -135,7 +135,7 @@
      {
 -	if( pTransition && !mbBrokenTexturesATI && !pTransition->mbUseMipMapEntering ) {
 +	if( pTransition && !cbBrokenTexturesATI && !pTransition->mbUseMipMapEntering ) {
- 	    glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, SlideSize.Width, SlideSize.Height, 0, Format, GL_UNSIGNED_BYTE, &EnteringBytes[0]);
+ 	    glTexImage2D(GL_TEXTURE_2D, 0, pDetectedFormat->nInternalFormat, SlideSize.Width, SlideSize.Height, 0, Format, GL_UNSIGNED_BYTE, &EnteringBytes[0]);
  	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
  	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
 @@ -731,7 +759,7 @@ void SAL_CALL OGLTransitionerImpl::updat