ooo-build r13101 - in trunk: . patches/dev300
- From: brosenk svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r13101 - in trunk: . patches/dev300
- Date: Mon, 7 Jul 2008 19:17:18 +0000 (UTC)
Author: brosenk
Date: Mon Jul 7 19:17:18 2008
New Revision: 13101
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13101&view=rev
Log:
m22-ify transogl-mesa-fallback.diff
Added:
trunk/patches/dev300/transogl-mesa-fallback-m21.diff
- copied unchanged from r13097, /trunk/patches/dev300/transogl-mesa-fallback.diff
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
trunk/patches/dev300/transogl-mesa-fallback.diff
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Mon Jul 7 19:17:18 2008
@@ -1712,14 +1712,15 @@
transogl-more-transitions-m21.diff
transogl-vsync-m21.diff
transogl-shader-transitions-m21.diff
+transogl-mesa-fallback-m21.diff
[ OpenGLTransitions >= dev300-m22 ]
transogl-more-transitions.diff
transogl-vsync.diff
transogl-shader-transitions.diff
+transogl-mesa-fallback.diff
[ OpenGLTransitions ]
-transogl-mesa-fallback.diff
transogl-shader-transitions-1.diff
transogl-dispose-fix.diff
transogl-sync-fix.diff
Modified: trunk/patches/dev300/transogl-mesa-fallback.diff
==============================================================================
--- trunk/patches/dev300/transogl-mesa-fallback.diff (original)
+++ trunk/patches/dev300/transogl-mesa-fallback.diff Mon Jul 7 19:17:18 2008
@@ -1,15 +1,14 @@
-diff -rup slideshow/source/engine/OGLTrans-orig/OGLTrans_TransitionerImpl.cxx slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx
---- slideshow/source/engine/OGLTrans-orig/OGLTrans_TransitionerImpl.cxx 2008-03-11 18:02:16.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx 2008-03-11 18:36:35.000000000 +0100
-@@ -88,6 +88,7 @@ public:
+--- slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx.oglfallback~ 2008-07-07 21:07:47.072846349 +0200
++++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx 2008-07-07 21:11:50.175122546 +0200
+@@ -93,6 +93,7 @@ public:
explicit OGLTransitionerImpl(OGLTransitionImpl* pOGLTransition);
bool initWindowFromSlideShowView( const uno::Reference< presentation::XSlideShowView >& xView, double, double);
void setSlides( const uno::Reference< rendering::XBitmap >& xLeavingSlide , const uno::Reference< rendering::XBitmap >& xEnteringSlide );
+ static void initialize( const uno::Reference< presentation::XSlideShowView >& xView );
// XTransition
- virtual SAL_CALL void update( double nTime ) throw (uno::RuntimeException);
-@@ -152,14 +153,62 @@ private:
+ virtual void SAL_CALL update( double nTime ) throw (uno::RuntimeException);
+@@ -166,14 +167,62 @@ private:
*/
OGLTransitionImpl* pTransition;
@@ -75,38 +74,35 @@
bool OGLTransitionerImpl::initWindowFromSlideShowView( const uno::Reference< presentation::XSlideShowView >& xView, double, double)
{
osl::MutexGuard const guard( m_aMutex );
-@@ -290,30 +339,6 @@ bool OGLTransitionerImpl::initWindowFrom
- }
+@@ -349,27 +398,6 @@ bool OGLTransitionerImpl::initWindowFrom
+ wglMakeCurrent(GLWin.hDC,GLWin.hRC);
+ #elif defined( UNX )
glXMakeCurrent( GLWin.dpy, GLWin.win, GLWin.ctx );
-
- if(GLWin.HasGLXExtension("GLX_SGI_swap_control")) {
-- // enable vsync
-- typedef GLint (*glXSwapIntervalProc)(GLint);
-- glXSwapIntervalProc glXSwapInterval = (glXSwapIntervalProc) unx::glXGetProcAddress( (const GLubyte*) "glXSwapIntervalSGI" );
-- if( glXSwapInterval ) {
-- glXSwapInterval( 1 );
-- OSL_TRACE("set swap interval to 1 (enable vsync)");
-- }
+- // enable vsync
+- typedef GLint (*glXSwapIntervalProc)(GLint);
+- glXSwapIntervalProc glXSwapInterval = (glXSwapIntervalProc) unx::glXGetProcAddress( (const GLubyte*) "glXSwapIntervalSGI" );
+- if( glXSwapInterval ) {
+- glXSwapInterval( 1 );
+- OSL_TRACE("set swap interval to 1 (enable vsync)");
+- }
- }
-
- const GLubyte* version = glGetString( GL_VERSION );
- if( version && version[0] ) {
-- mnGLVersion = version[0] - '0';
-- if( version[1] == '.' && version[2] )
-- mnGLVersion += (version[2] - '0')/10.0;
+- mnGLVersion = version[0] - '0';
+- if( version[1] == '.' && version[2] )
+- mnGLVersion += (version[2] - '0')/10.0;
- } else
-- mnGLVersion = 1.0;
+- mnGLVersion = 1.0;
- OSL_TRACE("GL version: %s parsed: %f", version, mnGLVersion );
-
- /* TODO: check for version once the bug in fglrx driver is fixed */
- mbBrokenTexturesATI = (strcmp( (const char *) glGetString( GL_VENDOR ), "ATI Technologies Inc." ) == 0 );
--
--
--
+ #endif
glEnable(GL_CULL_FACE);
glCullFace(GL_BACK);
- glClearColor (0, 0, 0, 0);
-@@ -331,7 +356,7 @@ bool OGLTransitionerImpl::initWindowFrom
+@@ -392,7 +420,7 @@ bool OGLTransitionerImpl::initWindowFrom
if( LeavingBytes.hasElements() && EnteringBytes.hasElements())
GLInitSlides();//we already have uninitialized slides, let's initialize
@@ -115,7 +111,7 @@
pTransition->prepare( GLleavingSlide, GLenteringSlide );
return true;
-@@ -369,7 +394,7 @@ void OGLTransitionerImpl::GLInitSlides()
+@@ -472,7 +500,7 @@ void OGLTransitionerImpl::GLInitSlides()
{
osl::MutexGuard const guard( m_aMutex );
@@ -124,25 +120,25 @@
return;
glMatrixMode(GL_PROJECTION);
-@@ -459,7 +484,7 @@ void OGLTransitionerImpl::GLInitSlides()
-
- glGenTextures(1, &GLleavingSlide);
- glBindTexture(GL_TEXTURE_2D, GLleavingSlide);
-- if( pTransition && !mbBrokenTexturesATI && !pTransition->mbUseMipMapLeaving) {
-+ if( pTransition && !cbBrokenTexturesATI && !pTransition->mbUseMipMapLeaving) {
- 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);
-@@ -483,7 +508,7 @@ void OGLTransitionerImpl::GLInitSlides()
-
- glGenTextures(1, &GLenteringSlide);
- glBindTexture(GL_TEXTURE_2D, GLenteringSlide);
-- 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]);
- glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
- glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
-@@ -508,7 +533,7 @@ void SAL_CALL OGLTransitionerImpl::updat
+@@ -643,7 +671,7 @@ void OGLTransitionerImpl::GLInitSlides()
+ }
+ else
+ {
+- if( pTransition && !mbBrokenTexturesATI && !pTransition->mbUseMipMapLeaving) {
++ if( pTransition && !cbBrokenTexturesATI && !pTransition->mbUseMipMapLeaving) {
+ glTexImage2D(GL_TEXTURE_2D, 0, pDetectedFormat->nInternalFormat, SlideSize.width,
+ SlideSize.Height, &LeavingBytes[0]);
+ glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
+@@ -699,7 +727,7 @@ void OGLTransitionerImpl::GLInitSlides()
+ }
+ else
+ {
+- 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]);
+ 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
{
osl::MutexGuard const guard( m_aMutex );
@@ -151,7 +147,7 @@
return;
glEnable(GL_DEPTH_TEST);
-@@ -612,6 +637,14 @@ public:
+@@ -856,6 +884,14 @@ public:
if( !hasTransition( transitionType, transitionSubType ) )
return uno::Reference< presentation::XTransition >();
@@ -166,9 +162,9 @@
OGLTransitionImpl* pTransition;
if( transitionType == animations::TransitionType::MISCSHAPEWIPE ) {
---- /home/rodo/svn/ooo-build-1/build/ooh680-m9-mesa/slideshow/source/engine/transitions/slidetransitionfactory.cxx 2008-03-10 18:45:01.000000000 +0100
-+++ slideshow/source/engine/transitions/slidetransitionfactory.cxx 2008-03-11 18:33:23.000000000 +0100
-@@ -131,7 +131,8 @@ public:
+--- slideshow/source/engine/transitions/slidetransitionfactory.cxx.oglfallback~ 2008-06-24 14:14:57.000000000 +0200
++++ slideshow/source/engine/transitions/slidetransitionfactory.cxx 2008-07-07 21:13:52.386845822 +0200
+@@ -127,7 +127,8 @@ public:
rViewContainer,
rScreenUpdater,
rEventMultiplexer ),
@@ -178,13 +174,13 @@
{
// create one transition per view
UnoViewVector::const_iterator aCurrView (rViewContainer.begin());
-@@ -143,19 +144,25 @@ public:
+@@ -139,19 +140,24 @@ public:
const ::basegfx::B2DPoint aOffsetPixel(
aViewTransform * ::basegfx::B2DPoint() );
- maTransitions.push_back(
- xFactory->createTransition(
-+ uno::Reference<presentation::XTransition> rTransition = xFactory->createTransition(
++ uno::Reference<presentation::XTransition> rTransition = xFactory->createTransition(
nTransitionType,
nTransitionSubType,
(*aCurrView)->getUnoView(),
@@ -193,21 +189,20 @@
- basegfx::unotools::point2DFromB2DPoint(aOffsetPixel) ) );
+ basegfx::unotools::point2DFromB2DPoint(aOffsetPixel) );
+
-+ if( rTransition.is() )
-+ maTransitions.push_back( rTransition );
-+ else
-+ return;
++ if( rTransition.is() )
++ maTransitions.push_back( rTransition );
++ else
++ return;
- ENSURE_AND_THROW(maTransitions.back().is(),
- "Failed to create plugin transition");
+ ENSURE_OR_THROW(maTransitions.back().is(),
+ "Failed to create plugin transition");
++aCurrView;
}
-+
-+ mbSuccess = true;
++ mbSuccess = true;
}
virtual bool operator()( double t )
-@@ -167,9 +174,17 @@ public:
+@@ -163,9 +169,17 @@ public:
return true;
}
@@ -225,7 +220,7 @@
};
-@@ -692,7 +707,7 @@ NumberAnimationSharedPtr createPluginTra
+@@ -688,7 +702,7 @@ NumberAnimationSharedPtr createPluginTra
const SoundPlayerSharedPtr& pSoundPlayer,
EventMultiplexer& rEventMultiplexer)
{
@@ -234,7 +229,7 @@
new PluginSlideChange(
nTransitionType,
nTransitionSubType,
-@@ -702,7 +717,14 @@ NumberAnimationSharedPtr createPluginTra
+@@ -698,7 +712,14 @@ NumberAnimationSharedPtr createPluginTra
rScreenUpdater,
xFactory,
pSoundPlayer,
@@ -250,7 +245,7 @@
}
} // anon namespace
-@@ -740,7 +762,7 @@ NumberAnimationSharedPtr TransitionFacto
+@@ -736,7 +757,7 @@ NumberAnimationSharedPtr TransitionFacto
xOptionalFactory->hasTransition(nTransitionType, nTransitionSubType) )
{
// #i82460# - optional plugin factory claims this transition. delegate.
@@ -259,7 +254,7 @@
createPluginTransition(
nTransitionType,
nTransitionSubType,
-@@ -751,6 +773,9 @@ NumberAnimationSharedPtr TransitionFacto
+@@ -747,6 +768,9 @@ NumberAnimationSharedPtr TransitionFacto
xOptionalFactory,
pSoundPlayer,
rEventMultiplexer ));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
