summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Edmundson <[email protected]>2025-05-30 21:05:14 +0300
committerDavid Edmundson <[email protected]>2025-06-03 12:19:03 +0300
commitd687ac6d3eeba48ae7b48fed037e61e22325634a (patch)
tree239e516e5b28510b0029e33cf2ca4cfa7c1ed6f3
parent5e7891f73fb1ba33a08ac9bd3fbcdab01d8a1193 (diff)
wayland: Drop unused member variable
The only mWaitingForUpdate is checked is to show a debug. The only public way to call requestUpdate is via QWindow::requestUpdate which has a guard already. Change-Id: I542e0f470ec2134f0a9fd415aab6ac7832e77263 Reviewed-by: David Redondo <[email protected]>
-rw-r--r--src/plugins/platforms/wayland/qwaylandwindow.cpp11
-rw-r--r--src/plugins/platforms/wayland/qwaylandwindow_p.h2
2 files changed, 0 insertions, 13 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp
index f40496d0e30..aaf2cc21b4b 100644
--- a/src/plugins/platforms/wayland/qwaylandwindow.cpp
+++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp
@@ -884,7 +884,6 @@ bool QWaylandWindow::waitForFrameSync(int timeout)
if (mWaitingForFrameCallback) {
qCDebug(lcWaylandBackingstore) << "Didn't receive frame callback in time, window should now be inexposed";
mFrameCallbackTimedOut = true;
- mWaitingForUpdate = false;
QMetaObject::invokeMethod(this, &QWaylandWindow::updateExposure, Qt::QueuedConnection);
}
@@ -1747,7 +1746,6 @@ void QWaylandWindow::timerEvent(QTimerEvent *event)
qCDebug(lcWaylandBackingstore) << "Didn't receive frame callback in time, window should now be inexposed";
mFrameCallbackTimedOut = true;
- mWaitingForUpdate = false;
updateExposure();
}
@@ -1763,13 +1761,6 @@ void QWaylandWindow::requestUpdate()
return;
}
- // If we've already called deliverUpdateRequest(), but haven't seen any attach+commit/swap yet
- // This is a somewhat redundant behavior and might indicate a bug in the calling code, so log
- // here so we can get this information when debugging update/frame callback issues.
- // Continue as nothing happened, though.
- if (mWaitingForUpdate)
- qCDebug(lcWaylandBackingstore) << "requestUpdate called twice without committing anything";
-
// Some applications (such as Qt Quick) depend on updates being delivered asynchronously,
// so use invokeMethod to delay the delivery a bit.
QMetaObject::invokeMethod(this, [this] {
@@ -1807,7 +1798,6 @@ void QWaylandWindow::handleUpdate()
wl_proxy_wrapper_destroy(wrappedSurface);
wl_callback_add_listener(mFrameCallback, &QWaylandWindow::callbackListener, this);
mWaitingForFrameCallback = true;
- mWaitingForUpdate = false;
// Start a timer for handling the case when the compositor stops sending frame callbacks.
if (mFrameCallbackTimeout > 0) {
@@ -1826,7 +1816,6 @@ void QWaylandWindow::handleUpdate()
void QWaylandWindow::deliverUpdateRequest()
{
qCDebug(lcWaylandBackingstore) << "deliverUpdateRequest";
- mWaitingForUpdate = true;
QPlatformWindow::deliverUpdateRequest();
}
diff --git a/src/plugins/platforms/wayland/qwaylandwindow_p.h b/src/plugins/platforms/wayland/qwaylandwindow_p.h
index 5d0f93b406e..5ad826018bb 100644
--- a/src/plugins/platforms/wayland/qwaylandwindow_p.h
+++ b/src/plugins/platforms/wayland/qwaylandwindow_p.h
@@ -314,8 +314,6 @@ protected:
QMutex mFrameSyncMutex;
QWaitCondition mFrameSyncWait;
- // True when we have called deliverRequestUpdate, but the client has not yet attached a new buffer
- std::atomic_bool mWaitingForUpdate = false;
bool mExposed = false;
std::atomic_bool mExposeEventNeedsAttachedBuffer = false;