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

Remove redundant window filter calls

Browse source 
If the window filter rejects a window, that window won't be in the
stacking_order and henceforth won't be painted, so finalDrawWindow()
does extra work of checking again if the window is accepted.
This commit is contained in:
Vlad Zahorodnii 2022-04-28 15:09:09 +03:00
parent 05877a8321
commit 16af4bf437
4 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/scene.cpp
View file

@ -616,9 +616,6 @@ void Scene::finalPaintWindow(EffectWindowImpl *w, int mask, const QRegion &regio
// will be eventually called from drawWindow() // will be eventually called from drawWindow()
void Scene::finalDrawWindow(EffectWindowImpl *w, int mask, const QRegion &region, WindowPaintData &data) void Scene::finalDrawWindow(EffectWindowImpl *w, int mask, const QRegion &region, WindowPaintData &data)
{ {
if (!m_filter.filterAcceptsWindow(w->window())) {
return;
}
w->sceneWindow()->performPaint(mask, region, data); w->sceneWindow()->performPaint(mask, region, data);
} }

2
src/scene.h
View file

@ -237,7 +237,7 @@ protected:
// shared implementation, starts painting the window // shared implementation, starts painting the window
virtual void paintWindow(SceneWindow *w, int mask, const QRegion &region); virtual void paintWindow(SceneWindow *w, int mask, const QRegion &region);
// called after all effects had their drawWindow() called // called after all effects had their drawWindow() called
virtual void finalDrawWindow(EffectWindowImpl *w, int mask, const QRegion &region, WindowPaintData &data); void finalDrawWindow(EffectWindowImpl *w, int mask, const QRegion &region, WindowPaintData &data);
virtual void paintOffscreenQuickView(OffscreenQuickView *w) = 0; virtual void paintOffscreenQuickView(OffscreenQuickView *w) = 0;

8
src/scenes/opengl/scene_opengl.cpp
View file

@ -311,14 +311,6 @@ SceneWindow *SceneOpenGL::createWindow(Window *t)
return new OpenGLWindow(t, this); return new OpenGLWindow(t, this);
} }
void SceneOpenGL::finalDrawWindow(EffectWindowImpl *w, int mask, const QRegion &region, WindowPaintData &data)
{
if (!m_filter.filterAcceptsWindow(w->window())) {
return;
}
performPaintWindow(w, mask, region, data);
}
void SceneOpenGL::performPaintWindow(EffectWindowImpl *w, int mask, const QRegion &region, WindowPaintData &data) void SceneOpenGL::performPaintWindow(EffectWindowImpl *w, int mask, const QRegion &region, WindowPaintData &data)
{ {
if (mask & PAINT_WINDOW_LANCZOS) { if (mask & PAINT_WINDOW_LANCZOS) {

1
src/scenes/opengl/scene_opengl.h
View file

@ -70,7 +70,6 @@ protected:
void paintSimpleScreen(int mask, const QRegion &region) override; void paintSimpleScreen(int mask, const QRegion &region) override;
void paintGenericScreen(int mask, const ScreenPaintData &data) override; void paintGenericScreen(int mask, const ScreenPaintData &data) override;
SceneWindow *createWindow(Window *t) override; SceneWindow *createWindow(Window *t) override;
void finalDrawWindow(EffectWindowImpl *w, int mask, const QRegion &region, WindowPaintData &data) override;
private: private:
void doPaintBackground(const QVector<float> &vertices); void doPaintBackground(const QVector<float> &vertices);