From 3305089ab395dbba4d3007b7ffcca6348067a921 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Mon, 25 Jan 2021 17:54:38 +0200 Subject: [PATCH] kwineffects: Fix detection of Radeon GPUs --- .../amd-gallium-radeon-rx-5700-xt-4.6 | 21 +++++++++++++++++++ libkwineffects/kwinglplatform.cpp | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 autotests/libkwineffects/data/glplatform/amd-gallium-radeon-rx-5700-xt-4.6 diff --git a/autotests/libkwineffects/data/glplatform/amd-gallium-radeon-rx-5700-xt-4.6 b/autotests/libkwineffects/data/glplatform/amd-gallium-radeon-rx-5700-xt-4.6 new file mode 100644 index 0000000000..c314ddafde --- /dev/null +++ b/autotests/libkwineffects/data/glplatform/amd-gallium-radeon-rx-5700-xt-4.6 @@ -0,0 +1,21 @@ +[Driver] +Vendor=AMD +Renderer=AMD Radeon RX 5700 XT (NAVI10, DRM 3.40.0, 5.10.9-arch1-1, LLVM 11.0.1) +Version=4.6 (Compatibility Profile) Mesa 20.3.3 +ShadingLanguageVersion=4.60 + +[Settings] +LooseBinding=true +GLSL=true +TextureNPOT=true +Mesa=true +Gallium=true +Radeon=true +GLVersion=4,6 +GLSLVersion=4,60 +MesaVersion=20,3,3 +GalliumVersion=0,4 +DriverVersion=20,3,3 +Driver=16 +ChipClass=14 +Compositor=9 diff --git a/libkwineffects/kwinglplatform.cpp b/libkwineffects/kwinglplatform.cpp index 56a97f02f1..85fd182eef 100644 --- a/libkwineffects/kwinglplatform.cpp +++ b/libkwineffects/kwinglplatform.cpp @@ -853,7 +853,7 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface) } // RadeonSI - else if (m_vendor == "X.Org" && + else if ((m_vendor == "X.Org" || m_vendor == "AMD") && (m_renderer.contains("TAHITI") || m_renderer.contains("PITCAIRN") || m_renderer.contains("VERDE") ||