ooo-build r12186 - in branches/sled-10-sp2-ooo-build-2-4: . patches/src680

[pmladek svn gnome org]

Author: pmladek
Date: Wed Apr 16 14:43:47 2008
New Revision: 12186
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12186&view=rev

Log:
2008-04-16  Radek Doulik  <rodo novell com>

	* patches/src680/transogl-dispose-fix.diff: remove part changing
	mipmap condition so that it doesn't regress (the ATI bug again)



Modified:
   branches/sled-10-sp2-ooo-build-2-4/ChangeLog
   branches/sled-10-sp2-ooo-build-2-4/patches/src680/transogl-dispose-fix.diff

Modified: branches/sled-10-sp2-ooo-build-2-4/patches/src680/transogl-dispose-fix.diff
==============================================================================
--- branches/sled-10-sp2-ooo-build-2-4/patches/src680/transogl-dispose-fix.diff	(original)
+++ branches/sled-10-sp2-ooo-build-2-4/patches/src680/transogl-dispose-fix.diff	Wed Apr 16 14:43:47 2008
@@ -20,24 +20,6 @@
  
      glEnable(GL_CULL_FACE);
      glCullFace(GL_BACK);
-@@ -489,7 +494,7 @@ void OGLTransitionerImpl::GLInitSlides()
-     
-     glGenTextures(1, &GLleavingSlide);
- 	glBindTexture(GL_TEXTURE_2D, GLleavingSlide);
--    if( pTransition && !cbBrokenTexturesATI && !pTransition->mbUseMipMapLeaving) {
-+    if( ( pTransition && !pTransition->mbUseMipMapLeaving ) || cbBrokenTexturesATI || cbMesa ) {
-         glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, SlideSize.Width, SlideSize.Height, 0, Format, GL_UNSIGNED_BYTE, &LeavingBytes[0]);
-         glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
-         glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
-@@ -513,7 +518,7 @@ void OGLTransitionerImpl::GLInitSlides()
- 	
- 	glGenTextures(1, &GLenteringSlide);
- 	glBindTexture(GL_TEXTURE_2D, GLenteringSlide);
--    if( pTransition && !cbBrokenTexturesATI && !pTransition->mbUseMipMapEntering ) {
-+    if( ( pTransition && !pTransition->mbUseMipMapLeaving ) || cbBrokenTexturesATI || cbMesa ) {
-         glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, 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);
 @@ -566,7 +571,10 @@ void OGLTransitionerImpl::disposing()
  
      if(GLWin.ctx)