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

Revert "Revert "QWaylandDisplay: Allow software-only deco and don't init GL needlessly""

Browse Source 
This reverts commit ddb35b21ee48ca72808d5bcd865edd4ba64d75e8.

Reason for revert: Cause for test failure has likely been addressed by 38ac95c03b423a063d095aaa4e3254a43f97c49b

Fixes: QTBUG-124284
Fixes: QTBUG-124285
Change-Id: Iedeb1d2800951e549fe4a4846aaaa477cfa497ae
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
This commit is contained in:
Kai Uwe Broulik 2024-05-14 11:11:19 +00:00
parent b28eed534f
commit 7cf59cf455
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/platforms/wayland/qwaylanddisplay.cpp
View File

@ -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;
}