yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compiling error if OpenGL headers are unavailable. Patch by Simon St

Browse source 
James.

svn path=/trunk/KDE/kdebase/workspace/; revision=880985
This commit is contained in:
Lucas Murray 2008-11-07 02:18:31 +00:00
parent c22847c5a7
commit fcb97626b0
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
effects/shadow.cpp
View file

@ -504,6 +504,7 @@ void ShadowEffect::drawQueuedShadows( EffectWindow* behindWindow )
// Modified version of SceneOpenGL::Window::prepareRenderStates() from scene_opengl.cpp // Modified version of SceneOpenGL::Window::prepareRenderStates() from scene_opengl.cpp
void ShadowEffect::prepareRenderStates( GLTexture *texture, double opacity, double brightness, double saturation ) void ShadowEffect::prepareRenderStates( GLTexture *texture, double opacity, double brightness, double saturation )
{ {
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
// setup blending of transparent windows // setup blending of transparent windows
glPushAttrib( GL_ENABLE_BIT ); glPushAttrib( GL_ENABLE_BIT );
/*if( saturation != 1.0 && texture->saturationSupported() ) /*if( saturation != 1.0 && texture->saturationSupported() )
@ -586,11 +587,13 @@ void ShadowEffect::prepareRenderStates( GLTexture *texture, double opacity, doub
glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE ); glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
glColor4f( opacityByBrightness, opacityByBrightness, opacityByBrightness, opacity); glColor4f( opacityByBrightness, opacityByBrightness, opacityByBrightness, opacity);
} }
#endif
} }
// Modified version of SceneOpenGL::Window::restoreRenderStates() from scene_opengl.cpp // Modified version of SceneOpenGL::Window::restoreRenderStates() from scene_opengl.cpp
void ShadowEffect::restoreRenderStates( GLTexture *texture, double opacity, double brightness, double saturation ) void ShadowEffect::restoreRenderStates( GLTexture *texture, double opacity, double brightness, double saturation )
{ {
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
if( opacity != 1.0 || saturation != 1.0 || brightness != 1.0 ) if( opacity != 1.0 || saturation != 1.0 || brightness != 1.0 )
{ {
/*if( saturation != 1.0 && texture->saturationSupported()) /*if( saturation != 1.0 && texture->saturationSupported())
@ -608,6 +611,7 @@ void ShadowEffect::restoreRenderStates( GLTexture *texture, double opacity, doub
} }
glPopAttrib(); // ENABLE_BIT glPopAttrib(); // ENABLE_BIT
#endif
} }
void ShadowEffect::drawShadow( EffectWindow* window, int mask, QRegion region, const WindowPaintData& data ) void ShadowEffect::drawShadow( EffectWindow* window, int mask, QRegion region, const WindowPaintData& data )