From 15655b1c1162b557f441d28b664347bdb73855f8 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 4 Nov 2022 04:51:01 +0200 Subject: [PATCH] kwin: remove checks for native paint engine in most cases the paint engine Katie uses is raster paint engine Signed-off-by: Ivailo Monev --- kwin/libkwineffects/kwinglobals.cpp | 7 --- kwin/libkwineffects/kwinglobals.h | 5 -- kwin/libkwineffects/kwinxrenderutils.cpp | 6 +-- kwin/paintredirector.cpp | 61 ------------------------ kwin/paintredirector.h | 20 -------- kwin/workspace.cpp | 6 --- 6 files changed, 1 insertion(+), 104 deletions(-) diff --git a/kwin/libkwineffects/kwinglobals.cpp b/kwin/libkwineffects/kwinglobals.cpp index 6b8cf43d..827233e3 100644 --- a/kwin/libkwineffects/kwinglobals.cpp +++ b/kwin/libkwineffects/kwinglobals.cpp @@ -42,8 +42,6 @@ along with this program. If not, see . namespace KWin { -bool Extensions::non_native_pixmaps = false; - void Extensions::init() { static bool initPerformed = false; @@ -59,11 +57,6 @@ void Extensions::init() XSyncQueryExtension(display(), &event_base, &error_base); #endif - QPixmap pix(1,1); - QPainter p(&pix); - non_native_pixmaps = p.paintEngine()->type() != QPaintEngine::X11; - p.end(); - kDebug(1212) << " non_native_pixmaps: " << non_native_pixmaps << endl; initPerformed = true; } diff --git a/kwin/libkwineffects/kwinglobals.h b/kwin/libkwineffects/kwinglobals.h index 4393fa1b..85f518c6 100644 --- a/kwin/libkwineffects/kwinglobals.h +++ b/kwin/libkwineffects/kwinglobals.h @@ -169,11 +169,6 @@ class KWIN_EXPORT Extensions { public: static void init(); - static bool nonNativePixmaps() { - return non_native_pixmaps; - } -private: - static bool non_native_pixmaps; }; } // namespace diff --git a/kwin/libkwineffects/kwinxrenderutils.cpp b/kwin/libkwineffects/kwinxrenderutils.cpp index 270474f5..05c0218f 100644 --- a/kwin/libkwineffects/kwinxrenderutils.cpp +++ b/kwin/libkwineffects/kwinxrenderutils.cpp @@ -109,11 +109,7 @@ static xcb_render_picture_t createPicture(xcb_pixmap_t pix, int depth) XRenderPicture::XRenderPicture(const QPixmap &pix) { - if (Extensions::nonNativePixmaps()) { - fromImage(pix.toImage()); - } else { - d = new XRenderPictureData(createPicture(pix.handle(), pix.depth())); - } + fromImage(pix.toImage()); } XRenderPicture::XRenderPicture(const QImage &img) diff --git a/kwin/paintredirector.cpp b/kwin/paintredirector.cpp index 7aa8e9ef..580821ff 100644 --- a/kwin/paintredirector.cpp +++ b/kwin/paintredirector.cpp @@ -40,9 +40,6 @@ namespace KWin PaintRedirector *PaintRedirector::create(Client *c, QWidget *widget) { - if (!Extensions::nonNativePixmaps()) { - return new NativeXRenderPaintRedirector(c, widget); - } return new RasterXRenderPaintRedirector(c, widget); } @@ -346,64 +343,6 @@ void RasterXRenderPaintRedirector::discardScratch() m_scratchImage = QImage(); } - - -// ------------------------------------------------------------------ - -NativeXRenderPaintRedirector::NativeXRenderPaintRedirector(Client *c, QWidget *widget) - : PaintRedirector(c, widget) -{ - resizePixmaps(); -} - -NativeXRenderPaintRedirector::~NativeXRenderPaintRedirector() -{ -} - -xcb_render_picture_t NativeXRenderPaintRedirector::picture(PaintRedirector::DecorationPixmap border) const -{ - return m_pixmaps[border].x11PictureHandle(); -} - -void NativeXRenderPaintRedirector::resize(PaintRedirector::DecorationPixmap border, const QSize &size) -{ - if (m_pixmaps[border].size() != size) { - m_pixmaps[border] = QPixmap(size); - } - m_pixmaps[border].fill(Qt::transparent); -} - -void NativeXRenderPaintRedirector::paint(PaintRedirector::DecorationPixmap border, const QRect &r, const QRect &b, const QRegion ®) -{ - QPainter pt(&m_pixmaps[border]); - pt.translate(-r.topLeft()); - pt.setCompositionMode(QPainter::CompositionMode_Source); - pt.setClipRegion(reg); - pt.drawPixmap(b.topLeft(), m_scratch); - pt.end(); -} - -void NativeXRenderPaintRedirector::fillScratch(Qt::GlobalColor color) -{ - m_scratch.fill(color); -} - -QPaintDevice *NativeXRenderPaintRedirector::recreateScratch(const QSize &size) -{ - m_scratch = QPixmap(size); - return &m_scratch; -} - -QPaintDevice *NativeXRenderPaintRedirector::scratch() -{ - return &m_scratch; -} - -void NativeXRenderPaintRedirector::discardScratch() -{ - m_scratch = QPixmap(); -} - } // namespace #include "moc_paintredirector.cpp" diff --git a/kwin/paintredirector.h b/kwin/paintredirector.h index 59ab7a13..66515935 100644 --- a/kwin/paintredirector.h +++ b/kwin/paintredirector.h @@ -118,26 +118,6 @@ private: bool m_requiresRepaint; }; -class NativeXRenderPaintRedirector : public PaintRedirector -{ - Q_OBJECT -public: - NativeXRenderPaintRedirector(Client *c, QWidget *widget); - virtual ~NativeXRenderPaintRedirector(); - -protected: - virtual xcb_render_picture_t picture(DecorationPixmap border) const; - virtual void resize(DecorationPixmap border, const QSize &size); - virtual void paint(DecorationPixmap border, const QRect &r, const QRect &b, const QRegion ®); - virtual void fillScratch(Qt::GlobalColor color); - virtual QPaintDevice *recreateScratch(const QSize &size); - virtual QPaintDevice *scratch(); - virtual void discardScratch(); -private: - QPixmap m_pixmaps[PixmapCount]; - QPixmap m_scratch; -}; - class RasterXRenderPaintRedirector : public PaintRedirector { Q_OBJECT diff --git a/kwin/workspace.cpp b/kwin/workspace.cpp index 170e947b..5437c98b 100644 --- a/kwin/workspace.cpp +++ b/kwin/workspace.cpp @@ -1309,12 +1309,6 @@ QString Workspace::supportInformation() const support.append(decorationPlugin()->supportInformation()); support.append("\nCompositing\n"); support.append( "===========\n"); - support.append("Qt Graphics System: "); - if (Extensions::nonNativePixmaps()) { - support.append("raster\n"); - } else { - support.append("native\n"); - } if (effects) { support.append("Compositing is active\n"); switch (effects->compositingType()) {