Fix build errors when configured without openGL
Changes and introduces some '#ifdef KWIN_HAVE_OPENGL_COMPOSITING' http://svn.reviewboard.kde.org/r/5903/ svn path=/trunk/KDE/kdebase/workspace/; revision=1198802
This commit is contained in:
parent
bdd0273411
commit
f3a34bd72a
2 changed files with 5 additions and 1 deletions
|
@ -1697,7 +1697,9 @@ EffectFrameImpl::EffectFrameImpl( EffectFrameStyle style, bool staticSize, QPoin
|
|||
|
||||
if( effects->compositingType() == OpenGLCompositing )
|
||||
{
|
||||
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
|
||||
m_sceneFrame = new SceneOpenGL::EffectFrame( this );
|
||||
#endif
|
||||
}
|
||||
else if( effects->compositingType() == XRenderCompositing )
|
||||
{
|
||||
|
|
|
@ -38,7 +38,9 @@ class WindowPaintData;
|
|||
class GLTexture;
|
||||
class GLRenderTarget;
|
||||
class GLShader;
|
||||
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
|
||||
class LanczosShader;
|
||||
#endif
|
||||
|
||||
class LanczosFilter
|
||||
: public QObject
|
||||
|
@ -55,11 +57,11 @@ class LanczosFilter
|
|||
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;
|
||||
|
|
Loading…
Reference in a new issue