diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-10-26 10:20:26 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-10-26 10:45:47 +0200 |
| commit | 25e777f92facb202741f9b1db2888ba5c19f4d68 (patch) | |
| tree | 04afcbcd04df6cdb00301446717d7b96df58947d /slideshow | |
| parent | 1cdf6ade0eeac9515ed88ae0cd802fe119dd4249 (diff) | |
Simplify ifdefs
Change-Id: I5c3835f6fdc215e5d9dc1b8146c12e0d1a57da7c
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index 28e68d5fae9d..8cdfe2125235 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx @@ -252,20 +252,16 @@ private: #if defined( GLX_EXT_texture_from_pixmap ) GLXPixmap maLeavingPixmapGL; GLXPixmap maEnteringPixmapGL; + Pixmap maLeavingPixmap; + Pixmap maEnteringPixmap; + bool mbFreeLeavingPixmap; + bool mbFreeEnteringPixmap; #endif #if defined( UNX ) && !defined( MACOSX ) bool mbRestoreSync; #endif bool mbUseLeavingPixmap; bool mbUseEnteringPixmap; -#if defined( GLX_EXT_texture_from_pixmap ) - bool mbFreeLeavingPixmap; - bool mbFreeEnteringPixmap; -#endif -#if defined( UNX ) && !defined( MACOSX ) - Pixmap maLeavingPixmap; - Pixmap maEnteringPixmap; -#endif /** the form the raw bytes are in for the bitmaps */ @@ -1381,20 +1377,16 @@ OGLTransitionerImpl::OGLTransitionerImpl() #if defined( GLX_EXT_texture_from_pixmap ) , maLeavingPixmapGL(0) , maEnteringPixmapGL(0) + , maLeavingPixmap(0) + , maEnteringPixmap(0) + , mbFreeLeavingPixmap(false) + , mbFreeEnteringPixmap(false) #endif #if defined( UNX ) && !defined( MACOSX ) , mbRestoreSync(false) #endif , mbUseLeavingPixmap(false) , mbUseEnteringPixmap(false) -#if defined( GLX_EXT_texture_from_pixmap ) - , mbFreeLeavingPixmap(false) - , mbFreeEnteringPixmap(false) -#endif -#if defined( UNX ) && !defined( MACOSX ) - , maLeavingPixmap(0) - , maEnteringPixmap(0) -#endif , maSlideBitmapLayout() , maSlideSize() , mbBrokenTexturesATI(false) |