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

kwin/blur: add a proper initialization of the texture cache

Browse source 
This fixes graphical glitches that appear next to the borders of plasma
tooltips. Additionally I added a variable that forces the effect to
drop the cache, which might be useful in the future to fix bugs.
This commit is contained in:
Philipp Knechtges 2011-12-10 17:31:18 +01:00
parent 1023d3b08e
commit 3065e6afce
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
effects/blur/blur.cpp
View file

@ -279,7 +279,12 @@ void BlurEffect::prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int t
// if a window underneath the blurred area is damaged we have to
// update the cached texture
const QRegion damagedCache = expand(expandedBlur & m_damagedArea) & expandedBlur;
QRegion damagedCache;
if (windows.contains(w) && !windows[w].dropCache) {
damagedCache = expand(expandedBlur & m_damagedArea) & expandedBlur;
} else {
damagedCache = expandedBlur;
}
if (!damagedCache.isEmpty()) {
// This is the area of the blurry window which really can change.
const QRegion damagedArea = damagedCache & blurArea;
@ -289,6 +294,7 @@ void BlurEffect::prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int t
if (windows.contains(w)) {
// In case we already have a texture cache mark the dirty regions invalid.
windows[w].damagedRegion |= damagedCache;
windows[w].dropCache = false;
}
// we keep track of the "damage propagation"
m_damagedArea |= damagedArea;
@ -480,12 +486,14 @@ void BlurEffect::doCachedBlur(EffectWindow *w, const QRegion& region, const floa
BlurWindowInfo bwi;
bwi.blurredBackground = GLTexture(r.width(),r.height());
bwi.damagedRegion = expanded;
bwi.dropCache = false;
windows[w] = bwi;
}
if (windows[w].blurredBackground.size() != r.size()) {
windows[w].blurredBackground = GLTexture(r.width(),r.height());
windows[w].damagedRegion = expanded;
windows[w].dropCache = false;
}
GLTexture targetTexture = windows[w].blurredBackground;

1
effects/blur/blur.h
View file

@ -77,6 +77,7 @@ private:
struct BlurWindowInfo {
GLTexture blurredBackground; // keeps the horizontally blurred background
QRegion damagedRegion;
bool dropCache;
};
QHash< const EffectWindow*, BlurWindowInfo > windows;