diff options
author | Aleix Pol <aleixpol@kde.org> | 2020-09-30 13:37:12 +0200 |
---|---|---|
committer | Aleix Pol <aleixpol@kde.org> | 2020-10-22 00:21:10 +0200 |
commit | cc779e0ed47ec4759dc3c23953dd02cfacc6885c (patch) | |
tree | fc843e2ef9bbc9b2690217132e6dbfa8deead858 | |
parent | f637fcdbbabeb060cdd223d8bc6662d5cace6b90 (diff) | |
download | qtwayland-cc779e0ed47ec4759dc3c23953dd02cfacc6885c.tar.gz |
Issue set_opaque_region on opaque surfaces
The application will tell Qt whether the background is transparent
through either Qt::WA_TranslucentBackground or QQuickWindow::setColor.
These will set a QSurfaceFormat.
This change checks the QSurfaceFormat and issues the opacity information
so we can properly implement culling optimizations in the compositor.
Change-Id: I4f7562467449eac7931f3011d4b835934212adad
Reviewed-by: David Edmundson <davidedmundson@kde.org>
(cherry picked from commit 0db685834f8377e41b147d3367b8ec514841eff5)
-rw-r--r-- | src/client/qwaylandwindow.cpp | 26 | ||||
-rw-r--r-- | src/client/qwaylandwindow_p.h | 3 |
2 files changed, 29 insertions, 0 deletions
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp index 1e26ee91..bc031ed5 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -364,6 +364,9 @@ void QWaylandWindow::setGeometry(const QRect &rect) if (mShellSurface) mShellSurface->setWindowGeometry(windowContentGeometry()); + + if (isOpaque() && mMask.isEmpty()) + setOpaqueArea(rect); } void QWaylandWindow::resizeFromApplyConfigure(const QSize &sizeWithMargins, const QPoint &offset) @@ -463,10 +466,16 @@ void QWaylandWindow::setMask(const QRegion &mask) if (mMask.isEmpty()) { mSurface->set_input_region(nullptr); + + if (isOpaque()) + setOpaqueArea(QRect(QPoint(0, 0), geometry().size())); } else { struct ::wl_region *region = mDisplay->createRegion(mMask); mSurface->set_input_region(region); wl_region_destroy(region); + + if (isOpaque()) + setOpaqueArea(mMask); } mSurface->commit(); @@ -1215,6 +1224,23 @@ bool QtWaylandClient::QWaylandWindow::startSystemMove() return false; } +bool QWaylandWindow::isOpaque() const +{ + return window()->requestedFormat().alphaBufferSize() <= 0; +} + +void QWaylandWindow::setOpaqueArea(const QRegion &opaqueArea) +{ + if (opaqueArea == mOpaqueArea || !mSurface) + return; + + mOpaqueArea = opaqueArea; + + struct ::wl_region *region = mDisplay->createRegion(opaqueArea); + mSurface->set_opaque_region(region); + wl_region_destroy(region); +} + } QT_END_NAMESPACE diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h index 35a2c032..6cc1664b 100644 --- a/src/client/qwaylandwindow_p.h +++ b/src/client/qwaylandwindow_p.h @@ -254,6 +254,7 @@ protected: Qt::WindowFlags mFlags; QRegion mMask; + QRegion mOpaqueArea; Qt::WindowStates mLastReportedWindowStates = Qt::WindowNoState; QWaylandShmBackingStore *mBackingStore = nullptr; @@ -270,6 +271,8 @@ private: void sendExposeEvent(const QRect &rect); static void closePopups(QWaylandWindow *parent); QPlatformScreen *calculateScreenFromSurfaceEvents() const; + void setOpaqueArea(const QRegion &opaqueArea); + bool isOpaque() const; void handleMouseEventWithDecoration(QWaylandInputDevice *inputDevice, const QWaylandPointerEvent &e); void handleScreensChanged(); |