From a49524bf035aa23007c8110a64b29d3b2663bdcf Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Thu, 24 Oct 2024 14:48:40 +0100 Subject: [PATCH] client: Drop outdated QT_WAYLAND_RESIZE_AFTER_SWAP QT_WAYLAND_RESIZE_AFTER_SWAP was added in15f82d0bc40eae635ed1377ae39253a8f515ea4a in 2014 to provide an opt-in-path to support drivers that did not apply an eglWindow resize until after the swap occurred. This is now the default in the EGL specification and fully supported in QtWayland. The environment variable does nothing. Change-Id: I8114d11801db5ba6863f48e2d44cca984bb58de7 Reviewed-by: Vlad Zahorodnii --- src/plugins/platforms/wayland/qwaylandwindow.cpp | 5 ----- src/plugins/platforms/wayland/qwaylandwindow_p.h | 2 -- 2 files changed, 7 deletions(-) diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp index 81969d16a5d..bc97cfd64d8 100644 --- a/src/plugins/platforms/wayland/qwaylandwindow.cpp +++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp @@ -51,7 +51,6 @@ QWaylandWindow::QWaylandWindow(QWindow *window, QWaylandDisplay *display) , mDisplay(display) , mSurfaceLock(QReadWriteLock::Recursive) , mShellIntegration(display->shellIntegration()) - , mResizeAfterSwap(qEnvironmentVariableIsSet("QT_WAYLAND_RESIZE_AFTER_SWAP")) { { bool ok; @@ -335,7 +334,6 @@ void QWaylandWindow::resetSurfaceRole() } mFrameCallbackTimedOut = false; mWaitingToApplyConfigure = false; - mResizeDirty = false; mExposed = false; } @@ -463,9 +461,6 @@ void QWaylandWindow::setGeometry(const QRect &r) if (mWindowDecorationEnabled) mWindowDecoration->update(); - if (mResizeAfterSwap && windowType() == Egl && mSentInitialResize) { - mResizeDirty = true; - } QWindowSystemInterface::handleGeometryChange(window(), geometry()); mSentInitialResize = true; } diff --git a/src/plugins/platforms/wayland/qwaylandwindow_p.h b/src/plugins/platforms/wayland/qwaylandwindow_p.h index 5bb7e2c6e02..c0a93189fea 100644 --- a/src/plugins/platforms/wayland/qwaylandwindow_p.h +++ b/src/plugins/platforms/wayland/qwaylandwindow_p.h @@ -307,8 +307,6 @@ protected: bool mExposed = false; bool mWaitingToApplyConfigure = false; - bool mResizeDirty = false; - bool mResizeAfterSwap; int mFrameCallbackTimeout = 100; QVariantMap m_properties;