kde-fix
/
kwin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove redundant usesOverlayWindow() method

Browse Source 
Whether an overlay window is used for compositing can be determined by
checking the return value of overlayWindow().
master
Vlad Zahorodnii 4 years ago
parent 8209cca810
commit 8681a69f47
24 changed files with 2 additions and 80 deletions
Show Stats Download Patch File Download Diff File

2
composite.cpp
Unescape Escape View File

@ -825,7 +825,7 @@ void X11Compositor::start()
}
void X11Compositor::handleFrameRequested(RenderLoop *renderLoop)
{
if (scene()->usesOverlayWindow() && !isOverlayWindowVisible()) {
if (scene()->overlayWindow() && !isOverlayWindowVisible()) {
// Return since nothing is visible.
return;
}

1
platformsupport/scenes/opengl/openglbackend.h
Unescape Escape View File

@ -58,7 +58,6 @@ public:
virtual void aboutToStartPainting(int screenId, const QRegion &damage);
virtual bool makeCurrent() = 0;
virtual void doneCurrent() = 0;
virtual bool usesOverlayWindow() const = 0;
virtual QRegion beginFrame(int screenId) = 0;
virtual void endFrame(int screenId, const QRegion &damage, const QRegion &damagedRegion) = 0;

1
platformsupport/scenes/xrender/xrenderbackend.h
Unescape Escape View File

@ -42,7 +42,6 @@ public:
* @return :OverlayWindow*
*/
virtual OverlayWindow *overlayWindow();
virtual bool usesOverlayWindow() const = 0;
/**
* @brief Shows the Overlay Window
*

5
plugins/platforms/drm/abstract_egl_drm_backend.cpp
Unescape Escape View File

@ -33,8 +33,3 @@ void AbstractEglDrmBackend::screenGeometryChanged(const QSize &size)
{
Q_UNUSED(size)
}
bool AbstractEglDrmBackend::usesOverlayWindow() const
{
return false;
}

1
plugins/platforms/drm/abstract_egl_drm_backend.h
Unescape Escape View File

@ -24,7 +24,6 @@ class AbstractEglDrmBackend : public AbstractEglBackend
public:
~AbstractEglDrmBackend();
bool usesOverlayWindow() const override;
void screenGeometryChanged(const QSize &size) override;
virtual int screenCount() const = 0;

5
plugins/platforms/drm/egl_multi_backend.cpp
Unescape Escape View File

@ -99,11 +99,6 @@ QSharedPointer<GLTexture> EglMultiBackend::textureForOutput(AbstractOutput *requ
return {};
}
bool EglMultiBackend::usesOverlayWindow() const
{
return false;
}
void EglMultiBackend::screenGeometryChanged(const QSize &size)
{
Q_UNUSED(size)

2
plugins/platforms/drm/egl_multi_backend.h
Unescape Escape View File

@ -32,8 +32,6 @@ public:
SceneOpenGLTexturePrivate *createBackendTexture(SceneOpenGLTexture *texture) override;
QSharedPointer<GLTexture> textureForOutput(AbstractOutput *requestedOutput) const override;
bool usesOverlayWindow() const override;
void screenGeometryChanged(const QSize &size) override;
void addBackend(AbstractEglDrmBackend *backend);

5
plugins/platforms/virtual/egl_gbm_backend.cpp
Unescape Escape View File

@ -214,11 +214,6 @@ void EglGbmBackend::endFrame(int screenId, const QRegion &renderedRegion, const
eglSwapBuffers(eglDisplay(), surface());
}
bool EglGbmBackend::usesOverlayWindow() const
{
return false;
}
/************************************************
* EglTexture
************************************************/

1
plugins/platforms/virtual/egl_gbm_backend.h
Unescape Escape View File

@ -28,7 +28,6 @@ public:
SceneOpenGLTexturePrivate *createBackendTexture(SceneOpenGLTexture *texture) override;
QRegion beginFrame(int screenId) override;
void endFrame(int screenId, const QRegion &renderedRegion, const QRegion &damagedRegion) override;
bool usesOverlayWindow() const override;
void init() override;
private:

5
plugins/platforms/wayland/egl_wayland_backend.cpp
Unescape Escape View File

@ -388,11 +388,6 @@ void EglWaylandBackend::endFrame(int screenId, const QRegion &renderedRegion, co
}
}
bool EglWaylandBackend::usesOverlayWindow() const
{
return false;
}
/************************************************
* EglTexture
************************************************/

1
plugins/platforms/wayland/egl_wayland_backend.h
Unescape Escape View File

@ -71,7 +71,6 @@ public:
SceneOpenGLTexturePrivate *createBackendTexture(SceneOpenGLTexture *texture) override;
QRegion beginFrame(int screenId) override;
void endFrame(int screenId, const QRegion &damage, const QRegion &damagedRegion) override;
bool usesOverlayWindow() const override;
void init() override;
bool havePlatformBase() const {

9
plugins/platforms/x11/common/eglonxbackend.cpp
Unescape Escape View File

@ -26,7 +26,6 @@ EglOnXBackend::EglOnXBackend(Display *display)
: AbstractEglBackend()
, m_overlayWindow(kwinApp()->platform()->createOverlayWindow())
, surfaceHasSubPost(0)
, m_usesOverlayWindow(true)
, m_connection(connection())
, m_x11Display(display)
, m_rootWindow(rootWindow())
@ -40,7 +39,6 @@ EglOnXBackend::EglOnXBackend(xcb_connection_t *connection, Display *display, xcb
: AbstractEglBackend()
, m_overlayWindow(nullptr)
, surfaceHasSubPost(0)
, m_usesOverlayWindow(false)
, m_connection(connection)
, m_x11Display(display)
, m_rootWindow(rootWindow)
@ -162,7 +160,7 @@ bool EglOnXBackend::initRenderingContext()
initBufferConfigs();
if (m_usesOverlayWindow) {
if (overlayWindow()) {
if (!overlayWindow()->create()) {
qCCritical(KWIN_CORE) << "Could not get overlay window";
return false;
@ -275,11 +273,6 @@ bool EglOnXBackend::initBufferConfigs()
return true;
}
bool EglOnXBackend::usesOverlayWindow() const
{
return m_usesOverlayWindow;
}
OverlayWindow* EglOnXBackend::overlayWindow() const
{
return m_overlayWindow;

2
plugins/platforms/x11/common/eglonxbackend.h
Unescape Escape View File

@ -28,7 +28,6 @@ public:
explicit EglOnXBackend(xcb_connection_t *connection, Display *display, xcb_window_t rootWindow, int screenNumber, xcb_window_t renderingWindow);
~EglOnXBackend() override;
OverlayWindow* overlayWindow() const override;
bool usesOverlayWindow() const override;
void init() override;
protected:
@ -53,7 +52,6 @@ private:
*/
OverlayWindow *m_overlayWindow;
int surfaceHasSubPost;
bool m_usesOverlayWindow;
xcb_connection_t *m_connection;
Display *m_x11Display;
xcb_window_t m_rootWindow;

5
plugins/platforms/x11/standalone/glxbackend.cpp
Unescape Escape View File

@ -806,11 +806,6 @@ OverlayWindow* GlxBackend::overlayWindow() const
return m_overlayWindow;
}
bool GlxBackend::usesOverlayWindow() const
{
return true;
}
/********************************************************
* GlxTexture
*******************************************************/

1
plugins/platforms/x11/standalone/glxbackend.h
Unescape Escape View File

@ -69,7 +69,6 @@ public:
bool makeCurrent() override;
void doneCurrent() override;
OverlayWindow* overlayWindow() const override;
bool usesOverlayWindow() const override;
void init() override;
private:

5
plugins/platforms/x11/standalone/x11xrenderbackend.cpp
Unescape Escape View File

@ -150,9 +150,4 @@ void X11XRenderBackend::screenGeometryChanged(const QSize &size)
init(false);
}
bool X11XRenderBackend::usesOverlayWindow() const
{
return true;
}
} // namespace KWin

1
plugins/platforms/x11/standalone/x11xrenderbackend.h
Unescape Escape View File

@ -32,7 +32,6 @@ public:
OverlayWindow *overlayWindow() override;
void showOverlay() override;
void screenGeometryChanged(const QSize &size) override;
bool usesOverlayWindow() const override;
private:
void init(bool createOverlay);

5
plugins/platforms/x11/windowed/egl_x11_backend.cpp
Unescape Escape View File

@ -59,11 +59,6 @@ bool EglX11Backend::createSurfaces()
return true;
}
bool EglX11Backend::usesOverlayWindow() const
{
return false;
}
QRegion EglX11Backend::beginFrame(int screenId)
{
makeContextCurrent(m_surfaces.at(screenId));

1
plugins/platforms/x11/windowed/egl_x11_backend.h
Unescape Escape View File

@ -26,7 +26,6 @@ public:
SceneOpenGLTexturePrivate *createBackendTexture(SceneOpenGLTexture *texture) override;
void init() override;
bool usesOverlayWindow() const override;
QRegion beginFrame(int screenId) override;
void endFrame(int screenId, const QRegion &damage, const QRegion &damagedRegion) override;
void screenGeometryChanged(const QSize &size) override;

6
plugins/scenes/opengl/scene_opengl.h
Unescape Escape View File

@ -41,7 +41,6 @@ public:
Shadow *createShadow(Toplevel *toplevel) override;
void screenGeometryChanged(const QSize &size) override;
OverlayWindow *overlayWindow() const override;
bool usesOverlayWindow() const override;
bool makeOpenGLContextCurrent() override;
void doneOpenGLContextCurrent() override;
bool supportsSurfacelessContext() const override;
@ -305,11 +304,6 @@ private:
QScopedPointer<GLTexture> m_texture;
};
inline bool SceneOpenGL::usesOverlayWindow() const
{
return m_backend->usesOverlayWindow();
}
inline SceneOpenGLTexture* OpenGLWindowPixmap::texture() const
{
return m_texture.data();

7
plugins/scenes/qpainter/scene_qpainter.h
Unescape Escape View File

@ -24,7 +24,6 @@ class KWIN_EXPORT SceneQPainter : public Scene
public:
~SceneQPainter() override;
bool usesOverlayWindow() const override;
OverlayWindow* overlayWindow() const override;
void paint(int screenId, const QRegion &damage, const QList<Toplevel *> &windows,
std::chrono::milliseconds presentTime) override;
@ -168,12 +167,6 @@ public:
Scene *create(QObject *parent = nullptr) const override;
};
inline
bool SceneQPainter::usesOverlayWindow() const
{
return false;
}
inline
OverlayWindow* SceneQPainter::overlayWindow() const
{

5
plugins/scenes/xrender/scene_xrender.cpp
Unescape Escape View File

@ -623,11 +623,6 @@ OverlayWindow *SceneXrender::overlayWindow() const
return m_backend->overlayWindow();
}
bool SceneXrender::usesOverlayWindow() const
{
return m_backend->usesOverlayWindow();
}
//****************************************
// XRenderWindowPixmap
//****************************************

1
plugins/scenes/xrender/scene_xrender.h
Unescape Escape View File

@ -39,7 +39,6 @@ public:
void screenGeometryChanged(const QSize &size) override;
xcb_render_picture_t xrenderBufferPicture() const override;
OverlayWindow *overlayWindow() const override;
bool usesOverlayWindow() const override;
Decoration::Renderer *createDecorationRenderer(Decoration::DecoratedClientImpl *client) override;
bool animationsSupported() const override {

5
scene.h
Unescape Escape View File

@ -151,11 +151,6 @@ public:
virtual QMatrix4x4 screenProjectionMatrix() const;
/**
* Whether the Scene uses an X11 overlay window to perform compositing.
*/
virtual bool usesOverlayWindow() const = 0;
virtual void triggerFence();
virtual Decoration::Renderer *createDecorationRenderer(Decoration::DecoratedClientImpl *) = 0;

Write Preview
Loading…
Cancel
Save