diff options
| author | Kai Uwe Broulik <kde@privat.broulik.de> | 2024-05-14 11:11:19 +0000 |
|---|---|---|
| committer | Kai Uwe Broulik <kde@privat.broulik.de> | 2024-05-15 06:33:00 +0000 |
| commit | 4c2fd790cc3c5c5a705c4070d1780621bce6688d (patch) | |
| tree | 10b48636db1c97063344f963e624207fb6d0e44c /src | |
| parent | f76e21eb74a472bfa56bd7432a82917435f3ae75 (diff) | |
Revert "Revert "QWaylandDisplay: Allow software-only deco and don't init GL needlessly""
This reverts commit 171e1d0d2761ba64cb15edbd32d02fb50ef57d28.
Reason for revert: Cause for test failure has likely been addressed by b9a5ffab93627cfedcead1574c8f0fd010b329b5
Fixes: QTBUG-124284
Fixes: QTBUG-124285
Change-Id: Iedeb1d2800951e549fe4a4846aaaa477cfa497ae
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/qwaylanddisplay.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp index 9bd60e741..e6ed0772f 100644 --- a/src/client/qwaylanddisplay.cpp +++ b/src/client/qwaylanddisplay.cpp @@ -891,7 +891,12 @@ bool QWaylandDisplay::supportsWindowDecoration() const if (disabled) return false; - static bool integrationSupport = clientBufferIntegration() && clientBufferIntegration()->supportsWindowDecoration(); + // Don't initialize client buffer integration just to check whether it can have a decoration. + if (!mWaylandIntegration->mClientBufferIntegrationInitialized) + return true; + + // We can do software-rendered decorations, only disable them if the integration explicitly says it can't. + static bool integrationSupport = !clientBufferIntegration() || clientBufferIntegration()->supportsWindowDecoration(); return integrationSupport; } |