Drop support for X11 overlay windows in QPainter render backend
It's unused.
This commit is contained in:
parent
e4861c28a7
commit
edfb0a3fd9
14 changed files with 4 additions and 63 deletions
|
@ -23,15 +23,6 @@ QPainterBackend::~QPainterBackend()
|
|||
{
|
||||
}
|
||||
|
||||
OverlayWindow* QPainterBackend::overlayWindow()
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void QPainterBackend::showOverlay()
|
||||
{
|
||||
}
|
||||
|
||||
void QPainterBackend::screenGeometryChanged(const QSize &size)
|
||||
{
|
||||
Q_UNUSED(size)
|
||||
|
|
|
@ -14,33 +14,15 @@ class QRegion;
|
|||
class QSize;
|
||||
class QString;
|
||||
|
||||
namespace KWin {
|
||||
class OverlayWindow;
|
||||
namespace KWin
|
||||
{
|
||||
|
||||
class QPainterBackend
|
||||
{
|
||||
public:
|
||||
virtual ~QPainterBackend();
|
||||
virtual void present(int mask, const QRegion &damage) = 0;
|
||||
|
||||
/**
|
||||
* @brief Returns the OverlayWindow used by the backend.
|
||||
*
|
||||
* A backend does not have to use an OverlayWindow, this is mostly for the X world.
|
||||
* In case the backend does not use an OverlayWindow it is allowed to return @c null.
|
||||
* It's the task of the caller to check whether it is @c null.
|
||||
*
|
||||
* @return :OverlayWindow*
|
||||
*/
|
||||
virtual OverlayWindow *overlayWindow();
|
||||
virtual bool usesOverlayWindow() const = 0;
|
||||
virtual void prepareRenderingFrame() = 0;
|
||||
/**
|
||||
* @brief Shows the Overlay Window
|
||||
*
|
||||
* Default implementation does nothing.
|
||||
*/
|
||||
virtual void showOverlay();
|
||||
/**
|
||||
* @brief React on screen geometry changes.
|
||||
*
|
||||
|
|
|
@ -124,11 +124,6 @@ void DrmQPainterBackend::present(int mask, const QRegion &damage)
|
|||
}
|
||||
}
|
||||
|
||||
bool DrmQPainterBackend::usesOverlayWindow() const
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool DrmQPainterBackend::perScreenRendering() const
|
||||
{
|
||||
return true;
|
||||
|
|
|
@ -30,7 +30,6 @@ public:
|
|||
QImage *buffer() override;
|
||||
QImage *bufferForScreen(int screenId) override;
|
||||
bool needsFullRepaint() const override;
|
||||
bool usesOverlayWindow() const override;
|
||||
void prepareRenderingFrame() override;
|
||||
void present(int mask, const QRegion &damage) override;
|
||||
bool perScreenRendering() const override;
|
||||
|
|
|
@ -82,11 +82,6 @@ void FramebufferQPainterBackend::present(int mask, const QRegion &damage)
|
|||
p.drawImage(QPoint(0, 0), m_backend->isBGR() ? m_renderBuffer.rgbSwapped() : m_renderBuffer);
|
||||
}
|
||||
|
||||
bool FramebufferQPainterBackend::usesOverlayWindow() const
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool FramebufferQPainterBackend::perScreenRendering() const
|
||||
{
|
||||
return true;
|
||||
|
|
|
@ -27,7 +27,6 @@ public:
|
|||
QImage *buffer() override;
|
||||
QImage *bufferForScreen(int screenId) override;
|
||||
bool needsFullRepaint() const override;
|
||||
bool usesOverlayWindow() const override;
|
||||
void prepareRenderingFrame() override;
|
||||
void present(int mask, const QRegion &damage) override;
|
||||
bool perScreenRendering() const override;
|
||||
|
|
|
@ -65,11 +65,6 @@ void VirtualQPainterBackend::present(int mask, const QRegion &damage)
|
|||
}
|
||||
}
|
||||
|
||||
bool VirtualQPainterBackend::usesOverlayWindow() const
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool VirtualQPainterBackend::perScreenRendering() const
|
||||
{
|
||||
return true;
|
||||
|
|
|
@ -29,7 +29,6 @@ public:
|
|||
QImage *buffer() override;
|
||||
QImage *bufferForScreen(int screenId) override;
|
||||
bool needsFullRepaint() const override;
|
||||
bool usesOverlayWindow() const override;
|
||||
void prepareRenderingFrame() override;
|
||||
void present(int mask, const QRegion &damage) override;
|
||||
bool perScreenRendering() const override;
|
||||
|
|
|
@ -142,11 +142,6 @@ WaylandQPainterBackend::~WaylandQPainterBackend()
|
|||
{
|
||||
}
|
||||
|
||||
bool WaylandQPainterBackend::usesOverlayWindow() const
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool WaylandQPainterBackend::perScreenRendering() const
|
||||
{
|
||||
return true;
|
||||
|
|
|
@ -64,8 +64,6 @@ public:
|
|||
explicit WaylandQPainterBackend(WaylandBackend *b);
|
||||
~WaylandQPainterBackend() override;
|
||||
|
||||
bool usesOverlayWindow() const override;
|
||||
|
||||
QImage *buffer() override;
|
||||
QImage *bufferForScreen(int screenId) override;
|
||||
|
||||
|
|
|
@ -80,11 +80,6 @@ void X11WindowedQPainterBackend::present(int mask, const QRegion &damage)
|
|||
}
|
||||
}
|
||||
|
||||
bool X11WindowedQPainterBackend::usesOverlayWindow() const
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool X11WindowedQPainterBackend::perScreenRendering() const
|
||||
{
|
||||
return true;
|
||||
|
|
|
@ -32,7 +32,6 @@ public:
|
|||
QImage *buffer() override;
|
||||
QImage *bufferForScreen(int screenId) override;
|
||||
bool needsFullRepaint() const override;
|
||||
bool usesOverlayWindow() const override;
|
||||
void prepareRenderingFrame() override;
|
||||
void present(int mask, const QRegion &damage) override;
|
||||
bool perScreenRendering() const override;
|
||||
|
|
|
@ -117,7 +117,6 @@ qint64 SceneQPainter::paint(const QRegion &_damage, const QList<Toplevel *> &top
|
|||
m_painter->restore();
|
||||
m_painter->end();
|
||||
}
|
||||
m_backend->showOverlay();
|
||||
m_backend->present(mask, overallUpdate);
|
||||
|
||||
// do cleanup
|
||||
|
|
|
@ -169,13 +169,13 @@ public:
|
|||
inline
|
||||
bool SceneQPainter::usesOverlayWindow() const
|
||||
{
|
||||
return m_backend->usesOverlayWindow();
|
||||
return false;
|
||||
}
|
||||
|
||||
inline
|
||||
OverlayWindow* SceneQPainter::overlayWindow() const
|
||||
{
|
||||
return m_backend->overlayWindow();
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
inline
|
||||
|
|
Loading…
Reference in a new issue