rpms/qt6-qtwayland
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Backport upstream fix: disable threaded GL on desktop NVIDIA

Browse Source
This commit is contained in:
Jan Grulich 2024-02-07 12:28:13 +01:00
parent ffd0ab1f9f
commit 64673fbfc9
2 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qt6-qtwayland.spec
View File

@ -11,7 +11,7 @@
Summary: Qt6 - Wayland platform support and QtCompositor module Summary: Qt6 - Wayland platform support and QtCompositor module
Name: qt6-%{qt_module} Name: qt6-%{qt_module}
Version: 6.6.1 Version: 6.6.1
Release: 3%{?dist} Release: 4%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io Url: http://www.qt.io
@ -25,10 +25,10 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
%endif %endif
# Upstream patches # Upstream patches
Patch0: qtwayland-client-disable-threaded-gl-on-desktop-nvidia.patch
# Upstreamable patches # Upstreamable patches
Patch10: qtwayland-use-adwaita-decorations-by-default.patch
Patch0: qtwayland-use-adwaita-decorations-by-default.patch
# filter qml provides # filter qml provides
%global __provides_exclude_from ^%{_qt6_archdatadir}/qml/.*\\.so$ %global __provides_exclude_from ^%{_qt6_archdatadir}/qml/.*\\.so$
@ -174,6 +174,9 @@ popd
%endif %endif
%changelog %changelog
* Wed Feb 07 2024 Jan Grulich <jgrulich@redhat.com>
- Backport upstream fix: disable threaded GL on desktop NVIDIA
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.1-3 * Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

40
qtwayland-client-disable-threaded-gl-on-desktop-nvidia.patch Normal file
View File

@ -0,0 +1,40 @@
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