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

This reverts commit 3652666c559382f6d575fa4102e132b71a58785f.

This optimization causes flakiness in the xdgdecorationv1 test, possibly
because it no longer handles the case where the supportsWindowDecoration()
function is called before the buffer integration is initialized.

So it unfortunately has to be reverted until a better approach can be
figured out.

Fixes: QTBUG-124259
Change-Id: I05f13a51b22b6779bffba531f08ebfd17a9afb38
Reviewed-by: David Redondo <qt@david-redondo.de>

1 files changed, 1 insertions, 6 deletions

diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp
index 07fbe0b41..265f0bb3f 100644
--- a/src/client/qwaylanddisplay.cpp
+++ b/src/client/qwaylanddisplay.cpp
@@ -891,12 +891,7 @@ bool QWaylandDisplay::supportsWindowDecoration() const
     if (disabled)
         return false;
 
-    // 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();
+    static bool integrationSupport = clientBufferIntegration() && clientBufferIntegration()->supportsWindowDecoration();
     return integrationSupport;
 }