Attempt to fix vmwgfx/sddm crash.

This commit is contained in:
Dave Airlie 2021-02-22 16:07:52 +10:00
parent 25895fd15b
commit 5e07467ada
2 changed files with 40 additions and 1 deletions

View file

@ -0,0 +1,33 @@
From d2dfc356e26e607bf0808e1b5a747cc1a2699681 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 22 Feb 2021 15:57:01 +1000
Subject: [PATCH] glx: proposed fix for setSwapInterval
When mesa gets a DRI2 1.1 connection (as experienced with
vmwware DDX) we don't get a pointer for this.
Don't explode just keep going.
Fixes: 60ebeb4608a8 ("glx: Implement GLX_EXT_swap_control for DRI2 and DRI3")
---
src/glx/glxcmds.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index 7882d606554..5d5d77d4f3d 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -1863,8 +1863,8 @@ glXSwapIntervalEXT(Display *dpy, GLXDrawable drawable, int interval)
__glXSendError(dpy, BadValue, interval, 0, True);
return;
}
-
- pdraw->psc->driScreen->setSwapInterval(pdraw, interval);
+ if (pdraw->psc->driScreen->setSwapInterval)
+ pdraw->psc->driScreen->setSwapInterval(pdraw, interval);
#endif
}
--
2.26.2

View file

@ -52,7 +52,7 @@ Name: mesa
Summary: Mesa graphics libraries Summary: Mesa graphics libraries
%global ver 20.3.4 %global ver 20.3.4
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
Release: 1%{?dist} Release: 2%{?dist}
License: MIT License: MIT
URL: http://www.mesa3d.org URL: http://www.mesa3d.org
@ -65,6 +65,9 @@ Source1: Mesa-MLAA-License-Clarification-Email.txt
# fix qemu/egl issue # fix qemu/egl issue
Patch2: fix-egl.patch Patch2: fix-egl.patch
# fix vmwgfx/sddm issue
Patch3: 0001-glx-proposed-fix-for-setSwapInterval.patch
BuildRequires: meson >= 0.45 BuildRequires: meson >= 0.45
BuildRequires: gcc BuildRequires: gcc
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -594,6 +597,9 @@ popd
%endif %endif
%changelog %changelog
* Mon Feb 22 2021 Dave Airlie <airlied@redhat.com> - 20.3.4-2
- Attempt to fix vmwgfx/sddm crash.
* Sat Jan 30 2021 Pete Walter <pwalter@fedoraproject.org> - 20.3.4-1 * Sat Jan 30 2021 Pete Walter <pwalter@fedoraproject.org> - 20.3.4-1
- Update to 20.3.4 - Update to 20.3.4