diff options
Diffstat (limited to 'dev-qt/qtwayland/files')
4 files changed, 0 insertions, 346 deletions
diff --git a/dev-qt/qtwayland/files/qtwayland-5.12.4-client-make-handleupdate-aware-of-exposure-changes.patch b/dev-qt/qtwayland/files/qtwayland-5.12.4-client-make-handleupdate-aware-of-exposure-changes.patch deleted file mode 100644 index 6aacad2a942e..000000000000 --- a/dev-qt/qtwayland/files/qtwayland-5.12.4-client-make-handleupdate-aware-of-exposure-changes.patch +++ /dev/null @@ -1,82 +0,0 @@ -From b13b595dc4f4fe6bdca7b69a21fd934ee233e149 Mon Sep 17 00:00:00 2001 -From: David Edmundson <davidedmundson@kde.org> -Date: Sun, 23 Jun 2019 14:48:30 +0200 -Subject: [PATCH] Client: Make handleUpdate aware of exposure changes - -The wl_surface can be destroyed whilst a render is happening. Calling -wl_surface::frame after the window is reset can crash as wl_surface is -null. - -Change-Id: I139a9b234cb6acba81d6c1d5fa58629904a25053 ---- - src/client/qwaylandwindow.cpp | 10 +++++++++- - src/client/qwaylandwindow_p.h | 4 ++++ - 2 files changed, 13 insertions(+), 1 deletion(-) - -diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp -index 5ea0dce1e..7e7a4929c 100644 ---- a/src/client/qwaylandwindow.cpp -+++ b/src/client/qwaylandwindow.cpp -@@ -79,6 +79,8 @@ Q_LOGGING_CATEGORY(lcWaylandBackingstore, "qt.qpa.wayland.backingstore") - - QWaylandWindow *QWaylandWindow::mMouseGrab = nullptr; - -+QReadWriteLock mSurfaceLock; -+ - QWaylandWindow::QWaylandWindow(QWindow *window) - : QPlatformWindow(window) - , mDisplay(waylandScreen()->display()) -@@ -210,6 +212,7 @@ void QWaylandWindow::initWindow() - - void QWaylandWindow::initializeWlSurface() - { -+ QWriteLocker lock(&mSurfaceLock); - init(mDisplay->createSurface(static_cast<QtWayland::wl_surface *>(this))); - } - -@@ -245,8 +248,10 @@ void QWaylandWindow::reset(bool sendDestroyEvent) - mShellSurface = nullptr; - delete mSubSurfaceWindow; - mSubSurfaceWindow = nullptr; -- if (isInitialized()) -+ if (isInitialized()) { -+ QWriteLocker lock(&mSurfaceLock); - destroy(); -+ } - mScreens.clear(); - - if (mFrameCallback) { -@@ -1145,6 +1150,9 @@ void QWaylandWindow::requestUpdate() - void QWaylandWindow::handleUpdate() - { - // TODO: Should sync subsurfaces avoid requesting frame callbacks? -+ QReadLocker lock(&mSurfaceLock); -+ if (!isInitialized()) -+ return; - - if (mFrameCallback) { - wl_callback_destroy(mFrameCallback); -diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h -index e8c9d5684..d3706442f 100644 ---- a/src/client/qwaylandwindow_p.h -+++ b/src/client/qwaylandwindow_p.h -@@ -53,6 +53,8 @@ - - #include <QtCore/QWaitCondition> - #include <QtCore/QMutex> -+#include <QtCore/QReadWriteLock> -+ - #include <QtGui/QIcon> - #include <QtCore/QVariant> - #include <QtCore/QLoggingCategory> -@@ -271,6 +273,8 @@ private: - static QMutex mFrameSyncMutex; - static QWaylandWindow *mMouseGrab; - -+ QReadWriteLock mSurfaceLock; -+ - friend class QWaylandSubSurface; - }; - --- -2.16.3 diff --git a/dev-qt/qtwayland/files/qtwayland-5.12.4-client-no-fake-surfacecreated-destroyed-events.patch b/dev-qt/qtwayland/files/qtwayland-5.12.4-client-no-fake-surfacecreated-destroyed-events.patch deleted file mode 100644 index c358e0f72de0..000000000000 --- a/dev-qt/qtwayland/files/qtwayland-5.12.4-client-no-fake-surfacecreated-destroyed-events.patch +++ /dev/null @@ -1,92 +0,0 @@ -From e6edc73942a76e57e7ac745217092333480f2c64 Mon Sep 17 00:00:00 2001 -From: David Edmundson <davidedmundson@kde.org> -Date: Sun, 23 Jun 2019 15:09:51 +0200 -Subject: [PATCH] Client: Don't send fake SurfaceCreated/Destroyed events - -QPlatformSurface relates to the backing store. Not the wl_surface. -They are emitted by QPlatformWindow. - -Due to a previously incorrect usage by KDE developers it was faked to -emit the events when the wl_surface is created/hidden to keep behavior. - -With QtBase a9246c7132a2c8864d3ae6cebd260bb9ee711fcb this now causes an -issue as now QWidgets react to this event in a breaking way. - -Change-Id: I2f003bc9da85f032a0053677fd281152099fc9eb ---- - .../wayland/custom-extension/client-common/customextension.cpp | 9 +++++++-- - src/client/qwaylandwindow.cpp | 10 ++-------- - src/client/qwaylandwindow_p.h | 2 +- - 3 files changed, 10 insertions(+), 11 deletions(-) - -diff --git a/examples/wayland/custom-extension/client-common/customextension.cpp b/examples/wayland/custom-extension/client-common/customextension.cpp -index aa0cb58a4..16f18fd7a 100644 ---- a/examples/wayland/custom-extension/client-common/customextension.cpp -+++ b/examples/wayland/custom-extension/client-common/customextension.cpp -@@ -81,8 +81,13 @@ QWindow *CustomExtension::windowForSurface(struct ::wl_surface *surface) - - bool CustomExtension::eventFilter(QObject *object, QEvent *event) - { -- if (event->type() == QEvent::PlatformSurface -- && static_cast<QPlatformSurfaceEvent*>(event)->surfaceEventType() == QPlatformSurfaceEvent::SurfaceCreated) { -+ if (event->type() == QEvent::Expose) { -+ auto ee = static_cast<QExposeEvent*>(event); -+ -+ if ((ee->region().isNull())) { -+ return false; -+ } -+ - QWindow *window = qobject_cast<QWindow*>(object); - Q_ASSERT(window); - window->removeEventFilter(this); -diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp -index ca7c8495c..a6331621d 100644 ---- a/src/client/qwaylandwindow.cpp -+++ b/src/client/qwaylandwindow.cpp -@@ -93,7 +93,7 @@ QWaylandWindow::~QWaylandWindow() - delete mWindowDecoration; - - if (isInitialized()) -- reset(false); -+ reset(); - - const QWindow *parent = window(); - foreach (QWindow *w, QGuiApplication::topLevelWindows()) { -@@ -119,8 +119,6 @@ void QWaylandWindow::initWindow() - - if (!isInitialized()) { - initializeWlSurface(); -- QPlatformSurfaceEvent e(QPlatformSurfaceEvent::SurfaceCreated); -- QGuiApplication::sendEvent(window(), &e); - } - - if (shouldCreateSubSurface()) { -@@ -227,12 +225,8 @@ bool QWaylandWindow::shouldCreateSubSurface() const - return QPlatformWindow::parent() != nullptr; - } - --void QWaylandWindow::reset(bool sendDestroyEvent) -+void QWaylandWindow::reset() - { -- if (isInitialized() && sendDestroyEvent) { -- QPlatformSurfaceEvent e(QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed); -- QGuiApplication::sendEvent(window(), &e); -- } - delete mShellSurface; - mShellSurface = nullptr; - delete mSubSurfaceWindow; -diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h -index 121ad8219..ba69fd9dc 100644 ---- a/src/client/qwaylandwindow_p.h -+++ b/src/client/qwaylandwindow_p.h -@@ -263,7 +263,7 @@ private: - void initializeWlSurface(); - bool shouldCreateShellSurface() const; - bool shouldCreateSubSurface() const; -- void reset(bool sendDestroyEvent = true); -+ void reset(); - void sendExposeEvent(const QRect &rect); - static void closePopups(QWaylandWindow *parent); - QWaylandScreen *calculateScreenFromSurfaceEvents() const; --- -2.16.3 diff --git a/dev-qt/qtwayland/files/qtwayland-5.12.4-client-reset-frame-callback-timer-when-window-hiding.patch b/dev-qt/qtwayland/files/qtwayland-5.12.4-client-reset-frame-callback-timer-when-window-hiding.patch deleted file mode 100644 index 8d4378243412..000000000000 --- a/dev-qt/qtwayland/files/qtwayland-5.12.4-client-reset-frame-callback-timer-when-window-hiding.patch +++ /dev/null @@ -1,39 +0,0 @@ -From a4e6f88f50d1a1dd56df77ce8b07b98aceb20ddc Mon Sep 17 00:00:00 2001 -From: David Edmundson <davidedmundson@kde.org> -Date: Sun, 23 Jun 2019 13:25:16 +0200 -Subject: [PATCH] Client: Reset frame callback timer when hiding a window - -If we hide a window whilst a compositor has a pending frame to show, -it's possible the compositor will not render the frame and not return -the callback. - -If this happens on the next window expose we can be left with -mFrameCallbackTimedOut still true causing isExposed() to remain false -and us to not send the next buffer when we later show the window again. - -Change-Id: I507410415d1a930fd5fa736412055e68fdf6c1d3 -Reviewed-by: Johan Helsing <johan.helsing@qt.io> ---- - src/client/qwaylandwindow.cpp | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp -index 7c8ecadaa..2b243bc44 100644 ---- a/src/client/qwaylandwindow.cpp -+++ b/src/client/qwaylandwindow.cpp -@@ -254,6 +254,13 @@ void QWaylandWindow::reset(bool sendDestroyEvent) - mFrameCallback = nullptr; - } - -+ int timerId = mFrameCallbackTimerId.fetchAndStoreOrdered(-1); -+ if (timerId != -1) { -+ killTimer(timerId); -+ } -+ mWaitingForFrameCallback = false; -+ mFrameCallbackTimedOut = false; -+ - mMask = QRegion(); - mQueuedBuffer = nullptr; - } --- -2.16.3 diff --git a/dev-qt/qtwayland/files/qtwayland-5.12.4-fix-stuttering-when-gui-thread-busy.patch b/dev-qt/qtwayland/files/qtwayland-5.12.4-fix-stuttering-when-gui-thread-busy.patch deleted file mode 100644 index 794fb1275298..000000000000 --- a/dev-qt/qtwayland/files/qtwayland-5.12.4-fix-stuttering-when-gui-thread-busy.patch +++ /dev/null @@ -1,133 +0,0 @@ -From ec9057081f1094fbfeb11449bc533997731e4079 Mon Sep 17 00:00:00 2001 -From: Johan Klokkhammer Helsing <johan.helsing@qt.io> -Date: Wed, 19 Jun 2019 14:05:22 +0200 -Subject: [PATCH] Client: Fix stuttering when the GUI thread is busy - -When we did invokeMethod for handling the frame callbacks, we had to wait for -the GUI thread to finish whatever it's doing before we would stop blocking. - -Fix it by clearing the frame callback timer and stop blocking immediately, -while delaying the rest of the work until it can be run on the other thread. - -Fixes: QTBUG-76397 -Change-Id: I343e4feac4838926b4fa2ccac2948988bc6c3bb7 -Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> ---- - src/client/qwaylandwindow.cpp | 59 +++++++++++++++++++++++-------------------- - src/client/qwaylandwindow_p.h | 2 +- - 2 files changed, 32 insertions(+), 29 deletions(-) - -diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp -index cecdbda92..7c8ecadaa 100644 ---- a/src/client/qwaylandwindow.cpp -+++ b/src/client/qwaylandwindow.cpp -@@ -610,29 +610,34 @@ const wl_callback_listener QWaylandWindow::callbackListener = { - Q_UNUSED(callback); - Q_UNUSED(time); - auto *window = static_cast<QWaylandWindow*>(data); -- if (window->thread() != QThread::currentThread()) -- QMetaObject::invokeMethod(window, [=] { window->handleFrameCallback(); }, Qt::QueuedConnection); -- else -- window->handleFrameCallback(); -+ window->handleFrameCallback(); - } - }; - - void QWaylandWindow::handleFrameCallback() - { -- bool wasExposed = isExposed(); -+ // Stop the timer and stop waiting immediately -+ int timerId = mFrameCallbackTimerId.fetchAndStoreOrdered(-1); -+ mWaitingForFrameCallback = false; - -- if (mFrameCallbackTimerId != -1) { -- killTimer(mFrameCallbackTimerId); -- mFrameCallbackTimerId = -1; -- } -+ // The rest can wait until we can run it on the correct thread -+ auto doHandleExpose = [this, timerId]() { -+ if (timerId != -1) -+ killTimer(timerId); - -- mWaitingForFrameCallback = false; -- mFrameCallbackTimedOut = false; -+ bool wasExposed = isExposed(); -+ mFrameCallbackTimedOut = false; -+ if (!wasExposed && isExposed()) // Did setting mFrameCallbackTimedOut make the window exposed? -+ sendExposeEvent(QRect(QPoint(), geometry().size())); -+ if (wasExposed && hasPendingUpdateRequest()) -+ deliverUpdateRequest(); -+ }; - -- if (!wasExposed && isExposed()) -- sendExposeEvent(QRect(QPoint(), geometry().size())); -- if (wasExposed && hasPendingUpdateRequest()) -- deliverUpdateRequest(); -+ if (thread() != QThread::currentThread()) { -+ QMetaObject::invokeMethod(this, doHandleExpose); -+ } else { -+ doHandleExpose(); -+ } - } - - QMutex QWaylandWindow::mFrameSyncMutex; -@@ -654,11 +659,11 @@ bool QWaylandWindow::waitForFrameSync(int timeout) - } - - // Stop current frame timer if any, can't use killTimer directly, because we might be on a diffent thread -- if (mFrameCallbackTimerId != -1) { -- int id = mFrameCallbackTimerId; -- mFrameCallbackTimerId = -1; -- QMetaObject::invokeMethod(this, [=] { killTimer(id); }, Qt::QueuedConnection); -- } -+ // Ordered semantics is needed to avoid stopping the timer twice and not miss it when it's -+ // started by other writes -+ int fcbId = mFrameCallbackTimerId.fetchAndStoreOrdered(-1); -+ if (fcbId != -1) -+ QMetaObject::invokeMethod(this, [=] { killTimer(fcbId); }, Qt::QueuedConnection); - - return !mWaitingForFrameCallback; - } -@@ -1090,9 +1095,9 @@ void QWaylandWindow::timerEvent(QTimerEvent *event) - } - } - -- if (event->timerId() == mFrameCallbackTimerId) { -- killTimer(mFrameCallbackTimerId); -- mFrameCallbackTimerId = -1; -+ -+ if (mFrameCallbackTimerId.testAndSetOrdered(event->timerId(), -1)) { -+ killTimer(event->timerId()); - qCDebug(lcWaylandBackingstore) << "Didn't receive frame callback in time, window should now be inexposed"; - mFrameCallbackTimedOut = true; - mWaitingForUpdate = false; -@@ -1154,11 +1159,9 @@ void QWaylandWindow::handleUpdate() - mWaitingForUpdate = false; - - // Stop current frame timer if any, can't use killTimer directly, see comment above. -- if (mFrameCallbackTimerId != -1) { -- int id = mFrameCallbackTimerId; -- mFrameCallbackTimerId = -1; -- QMetaObject::invokeMethod(this, [=] { killTimer(id); }, Qt::QueuedConnection); -- } -+ int fcbId = mFrameCallbackTimerId.fetchAndStoreOrdered(-1); -+ if (fcbId != -1) -+ QMetaObject::invokeMethod(this, [=] { killTimer(fcbId); }, Qt::QueuedConnection); - - // Start a timer for handling the case when the compositor stops sending frame callbacks. - QMetaObject::invokeMethod(this, [=] { // Again; can't do it directly -diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h -index c47123dc9..e8c9d5684 100644 ---- a/src/client/qwaylandwindow_p.h -+++ b/src/client/qwaylandwindow_p.h -@@ -216,7 +216,7 @@ protected: - WId mWindowId; - bool mWaitingForFrameCallback = false; - bool mFrameCallbackTimedOut = false; // Whether the frame callback has timed out -- int mFrameCallbackTimerId = -1; // Started on commit, reset on frame callback -+ QAtomicInt mFrameCallbackTimerId = -1; // Started on commit, reset on frame callback - struct ::wl_callback *mFrameCallback = nullptr; - struct ::wl_event_queue *mFrameQueue = nullptr; - QWaitCondition mFrameSyncWait; --- -2.16.3 |