1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: Drop unused member variable

Browse Source 
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 <qt@david-redondo.de>
This commit is contained in:
David Edmundson 2025-05-30 21:05:14 +03:00
parent 5e7891f73f
commit d687ac6d3e
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -884,7 +884,6 @@ bool QWaylandWindow::waitForFrameSync(int timeout)
if (mWaitingForFrameCallback) { if (mWaitingForFrameCallback) {
qCDebug(lcWaylandBackingstore) << "Didn't receive frame callback in time, window should now be inexposed"; qCDebug(lcWaylandBackingstore) << "Didn't receive frame callback in time, window should now be inexposed";
mFrameCallbackTimedOut = true; mFrameCallbackTimedOut = true;
mWaitingForUpdate = false;
QMetaObject::invokeMethod(this, &QWaylandWindow::updateExposure, Qt::QueuedConnection); 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"; qCDebug(lcWaylandBackingstore) << "Didn't receive frame callback in time, window should now be inexposed";
mFrameCallbackTimedOut = true; mFrameCallbackTimedOut = true;
mWaitingForUpdate = false;
updateExposure(); updateExposure();
} }
@ -1763,13 +1761,6 @@ void QWaylandWindow::requestUpdate()
return; 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, // Some applications (such as Qt Quick) depend on updates being delivered asynchronously,
// so use invokeMethod to delay the delivery a bit. // so use invokeMethod to delay the delivery a bit.
QMetaObject::invokeMethod(this, [this] { QMetaObject::invokeMethod(this, [this] {
@ -1807,7 +1798,6 @@ void QWaylandWindow::handleUpdate()
wl_proxy_wrapper_destroy(wrappedSurface); wl_proxy_wrapper_destroy(wrappedSurface);
wl_callback_add_listener(mFrameCallback, &QWaylandWindow::callbackListener, this); wl_callback_add_listener(mFrameCallback, &QWaylandWindow::callbackListener, this);
mWaitingForFrameCallback = true; mWaitingForFrameCallback = true;
mWaitingForUpdate = false;
// Start a timer for handling the case when the compositor stops sending frame callbacks. // Start a timer for handling the case when the compositor stops sending frame callbacks.
if (mFrameCallbackTimeout > 0) { if (mFrameCallbackTimeout > 0) {
@ -1826,7 +1816,6 @@ void QWaylandWindow::handleUpdate()
void QWaylandWindow::deliverUpdateRequest() void QWaylandWindow::deliverUpdateRequest()
{ {
qCDebug(lcWaylandBackingstore) << "deliverUpdateRequest"; qCDebug(lcWaylandBackingstore) << "deliverUpdateRequest";
mWaitingForUpdate = true;
QPlatformWindow::deliverUpdateRequest(); QPlatformWindow::deliverUpdateRequest();
} }

2
src/plugins/platforms/wayland/qwaylandwindow_p.h
View File

@ -314,8 +314,6 @@ protected:
QMutex mFrameSyncMutex; QMutex mFrameSyncMutex;
QWaitCondition mFrameSyncWait; 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; bool mExposed = false;
std::atomic_bool mExposeEventNeedsAttachedBuffer = false; std::atomic_bool mExposeEventNeedsAttachedBuffer = false;