[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/kwin
From:       Anselmo Melo <anselmo.melo () openbossa ! org>
Date:       2010-11-19 20:14:03
Message-ID: 20101119201404.041C5AC8A0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1198802 by amelo:

Fix build errors when configured without openGL

Changes and introduces some '#ifdef KWIN_HAVE_OPENGL_COMPOSITING'
http://svn.reviewboard.kde.org/r/5903/



 M  +2 -0      effects.cpp  
 M  +3 -1      lanczosfilter.h  


--- trunk/KDE/kdebase/workspace/kwin/effects.cpp #1198801:1198802
@@ -1697,7 +1697,9 @@
 
     if( effects->compositingType() == OpenGLCompositing )
         {
+#ifdef KWIN_HAVE_OPENGL_COMPOSITING
         m_sceneFrame = new SceneOpenGL::EffectFrame( this );
+#endif
         }
     else if( effects->compositingType() == XRenderCompositing )
         {
--- trunk/KDE/kdebase/workspace/kwin/lanczosfilter.h #1198801:1198802
@@ -38,7 +38,9 @@
 class GLTexture;
 class GLRenderTarget;
 class GLShader;
+#ifdef KWIN_HAVE_OPENGL_COMPOSITING
 class LanczosShader;
+#endif
 
 class LanczosFilter
     : public QObject
@@ -55,11 +57,11 @@
     private:
         void init();
         void updateOffscreenSurfaces();
-#ifdef KWIN_HAVE_OPENGL_COMPOSITING
         void prepareRenderStates( GLTexture* tex, double opacity, double brightness, \
                double saturation );
         void restoreRenderStates( GLTexture* tex, double opacity, double brightness, \
double saturation );  GLTexture *m_offscreenTex;
         GLRenderTarget *m_offscreenTarget;
+#ifdef KWIN_HAVE_OPENGL_COMPOSITING
         LanczosShader *m_shader;
 #endif
         QBasicTimer m_timer;


[prev in list] [next in list] [prev in thread] [next in thread]