Hello community,
here is the log from the commit of package kwin5 for openSUSE:Factory checked
in at 2020-10-19 17:49:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kwin5 (Old)
and /work/SRC/openSUSE:Factory/.kwin5.new.3486 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwin5"
Mon Oct 19 17:49:49 2020 rev:128 rq:842592 version:5.20.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kwin5/kwin5.changes 2020-10-13
15:31:22.060911619 +0200
+++ /work/SRC/openSUSE:Factory/.kwin5.new.3486/kwin5.changes 2020-10-19
17:49:50.646116344 +0200
@@ -1,0 +2,6 @@
+Mon Oct 19 14:14:02 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Add patch to fix software rendering detection with Mesa 20.2+:
+ * 0001-Detect-softpipe-and-llvmpipe-on-Mesa-20.2.patch
+
+-------------------------------------------------------------------
New:
----
0001-Detect-softpipe-and-llvmpipe-on-Mesa-20.2.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kwin5.spec ++++++
--- /var/tmp/diff_new_pack.ygyK6F/_old 2020-10-19 17:49:51.542115976 +0200
+++ /var/tmp/diff_new_pack.ygyK6F/_new 2020-10-19 17:49:51.546115974 +0200
@@ -36,6 +36,8 @@
Source1: kwin-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
+# PATCH-FIX-UPSTREAM https://invent.kde.org/plasma/kwin/-/merge_requests/364
+Patch1: 0001-Detect-softpipe-and-llvmpipe-on-Mesa-20.2.patch
# PATCH-FIX-OPENSUSE
Patch100: 0001-Revert-Make-WindowSwitching-Alt-Tab-the-default-left.patch
# PATCH-FEATURE-OPENSUSE
++++++ 0001-Detect-softpipe-and-llvmpipe-on-Mesa-20.2.patch ++++++
>From 6addcab364d972d0f990f50e8125390ee290ecbc Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fab...@ritter-vogt.de>
Date: Mon, 19 Oct 2020 14:53:38 +0000
Subject: [PATCH] Detect softpipe and llvmpipe on Mesa 20.2+
It seems like the vendor string changed from "VMware Inc." to "Mesa/X.org".
---
.../data/glplatform/llvmpipe-10.0 | 22 +++++++++++++++++++
libkwineffects/kwinglplatform.cpp | 4 ++--
2 files changed, 24 insertions(+), 2 deletions(-)
create mode 100644 autotests/libkwineffects/data/glplatform/llvmpipe-10.0
diff --git a/autotests/libkwineffects/data/glplatform/llvmpipe-10.0
b/autotests/libkwineffects/data/glplatform/llvmpipe-10.0
new file mode 100644
index 000000000..92581afb6
--- /dev/null
+++ b/autotests/libkwineffects/data/glplatform/llvmpipe-10.0
@@ -0,0 +1,22 @@
+[Driver]
+Vendor=Mesa/X.org
+Renderer=llvmpipe (LLVM 10.0.1, 256 bits)
+Version=3.1 Mesa 20.2.1
+ShadingLanguageVersion=1.40
+
+[Settings]
+LooseBinding=true
+GLSL=true
+TextureNPOT=true
+Mesa=true
+Gallium=true
+SoftwareEmulation=true
+GLVersion=3,1
+GLSLVersion=1,40
+MesaVersion=20,2,1
+GalliumVersion=0,4
+DriverVersion=20,2,1
+Driver=12
+ChipClass=99999
+Compositor=9
+
diff --git a/libkwineffects/kwinglplatform.cpp
b/libkwineffects/kwinglplatform.cpp
index bccb7be14..56a97f02f 100644
--- a/libkwineffects/kwinglplatform.cpp
+++ b/libkwineffects/kwinglplatform.cpp
@@ -894,12 +894,12 @@ void GLPlatform::detect(OpenGLPlatformInterface
platformInterface)
}
// softpipe
- else if (m_vendor == "VMware, Inc." && m_chipset == "softpipe" ) {
+ else if (m_chipset == "softpipe") {
m_driver = Driver_Softpipe;
}
// llvmpipe
- else if (m_vendor == "VMware, Inc." && m_chipset == "llvmpipe") {
+ else if (m_chipset == "llvmpipe") {
m_driver = Driver_Llvmpipe;
}
--
2.25.1
