41 lines
1.8 KiB
Diff
41 lines
1.8 KiB
Diff
From e4156bad6398dcbe8740041148d95ee9ed437d8b Mon Sep 17 00:00:00 2001
|
|
From: David Redondo <qt@david-redondo.de>
|
|
Date: Wed, 31 Jan 2024 09:01:48 +0100
|
|
Subject: [PATCH] client: Disable threaded GL on desktop NVIDIA
|
|
|
|
Otherwise QtQuick windows freeze when resized.
|
|
In order to still use threaded rendering on
|
|
embedded platforms where resizing is not required
|
|
we check if XDG_CURRENT_DESKTOP which should be
|
|
set by desktop environments.
|
|
|
|
Task-number: QTBUG-95817
|
|
Pick-to: 6.6.2
|
|
Change-Id: Ic2348c3169e0ade8c5463e3d7c7a1c45037a89a7
|
|
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
|
|
Reviewed-by: David Edmundson <davidedmundson@kde.org>
|
|
(cherry picked from commit 6d83cf94b568fa9e591761a182cf84e3959fbf32)
|
|
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
(cherry picked from commit 38348ce5b06624cb6e36f814ebdfbc3ec61f1691)
|
|
Reviewed-by: David Redondo <qt@david-redondo.de>
|
|
---
|
|
|
|
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp
|
|
index cc7ee90..3b97aef 100644
|
|
--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp
|
|
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp
|
|
@@ -92,6 +92,13 @@
|
|
break;
|
|
}
|
|
}
|
|
+
|
|
+ // On desktop NVIDIA resizing QtQuick freezes them when using threaded rendering QTBUG-95817
|
|
+ // In order to support threaded rendering on embedded platforms where resizing is not needed
|
|
+ // we check if XDG_CURRENT_DESKTOP is set which desktop environments should set
|
|
+ if (qstrcmp(vendor, "NVIDIA") == 0 && qEnvironmentVariableIsSet("XDG_CURRENT_DESKTOP")) {
|
|
+ m_supportsThreading = false;
|
|
+ }
|
|
}
|
|
|
|
bool QWaylandEglClientBufferIntegration::isValid() const
|