pool/Mesa
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 979185 from X11:XOrg

Browse Source 
- buildrequire DirectX-Headers only on %{ix86} x86_64, since it's
  only relevant on these platforms 

- Calling patch with '-p1' (as the others are) so 'git show'
  .patch output works.

- Generating 'n_stop-iris-flicker.patch' from 'git format-patch' vs.
  a standard diff.

- Fixing up 'stop-iris-flicker.patch' patch name to follow standards.

- Switching out 'directx-headers' for 'DirectX-Headers'.

- Adding changes I need for iris to not flicker and have d3d12
  available for use in WSL.

- Adding 'stop-iris-flicker.patch'.

OBS-URL: https://build.opensuse.org/request/show/979185
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=440
This commit is contained in:
Dominique Leuenberger 2022-05-26 16:43:38 +00:00 committed by Git OBS Bridge
commit 6e037be9a0
3 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Mesa.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Wed May 25 12:27:30 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
- buildrequire DirectX-Headers only on %{ix86} x86_64, since it's
only relevant on these platforms
-------------------------------------------------------------------
Tue May 24 19:18:59 UTC 2022 - Scott Bradnick <scott.bradnick@suse.com>
- Calling patch with '-p1' (as the others are) so 'git show'
.patch output works.
-------------------------------------------------------------------
Tue May 24 18:50:21 UTC 2022 - Scott Bradnick <scott.bradnick@suse.com>
- Generating 'n_stop-iris-flicker.patch' from 'git format-patch' vs.
a standard diff.
-------------------------------------------------------------------
Tue May 24 15:48:53 UTC 2022 - Scott Bradnick <scott.bradnick@suse.com>
- Fixing up 'stop-iris-flicker.patch' patch name to follow standards.
-------------------------------------------------------------------
Thu May 19 19:00:09 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
@ -25,12 +48,23 @@ Tue May 3 08:21:55 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
* raised requirements to 9 GB disk space and added aarch64
architecture (bsc#1199040)
-------------------------------------------------------------------
Thu Apr 28 21:22:38 UTC 2022 - Scott Bradnick <scott.bradnick@suse.com>
- Switching out 'directx-headers' for 'DirectX-Headers'.
-------------------------------------------------------------------
Fri Apr 22 09:06:31 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
- Update to 22.0.2
* bugfix release with almost all nominated patches
-------------------------------------------------------------------
Thu Apr 14 19:29:21 UTC 2022 - Scott Bradnick <scott.bradnick@suse.com>
- Adding changes I need for iris to not flicker and have d3d12
available for use in WSL.
-------------------------------------------------------------------
Wed Apr 13 12:30:21 UTC 2022 - Dirk Müller <dmueller@suse.com>
@ -159,6 +193,11 @@ Sat Jan 8 10:21:21 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
* no longer disable sse2 support for intel drivers, since this
breaks build, which is probably unresolvable (boo1190409)
-------------------------------------------------------------------
Fri Jan 7 19:35:29 UTC 2022 - Scott Bradnick <scott.bradnick@suse.com>
- Adding 'stop-iris-flicker.patch'.
-------------------------------------------------------------------
Thu Jan 6 16:34:30 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>

8
Mesa.spec
View File

@ -126,7 +126,12 @@ Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch
Patch200: u_fix-build-on-ppc64le.patch
Patch300: n_buildfix-21.3.0.patch
Patch400: n_no-sse2-on-ix86-except-for-intel-drivers.patch
Patch500: n_stop-iris-flicker.patch
%ifarch %{ix86} x86_64
BuildRequires: DirectX-Headers
%endif
BuildRequires: bison
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: flex
BuildRequires: gcc-c++
@ -741,6 +746,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%ifarch %{ix86}
%patch400 -p1
%endif
%patch500 -p1
# Remove requires to vulkan libs from baselibs.conf on platforms
# where vulkan build is disabled; ugly ...
@ -816,7 +822,7 @@ egl_platforms=x11,wayland
%endif
%ifarch %{ix86} x86_64
-Ddri-drivers= \
-Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl,iris,crocus,i915 \
-Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl,iris,crocus,i915,d3d12 \
%else
%ifarch %{arm} aarch64
-Ddri-drivers= \

20
n_stop-iris-flicker.patch Normal file
View File

@ -0,0 +1,20 @@
commit 5d6f7baf3bc40a85b09e4088c8c3bccec6a7c82d
Author: Scott Bradnick <scott.bradnick@suse.com>
Date: Tue May 24 14:47:53 2022 -0400
Adjusting 'iris_batch.c' per 'https://gitlab.freedesktop.org/mesa/mesa/-/issues/5731'.
diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c
index 71cb2096ad1..0a72d2a07c3 100644
--- a/src/gallium/drivers/iris/iris_batch.c
+++ b/src/gallium/drivers/iris/iris_batch.c
@@ -926,8 +926,7 @@ submit_batch(struct iris_batch *batch)
(struct drm_i915_gem_exec_object2) {
.handle = bo->gem_handle,
.offset = bo->address,
- .flags = bo->real.kflags | (written ? EXEC_OBJECT_WRITE : 0) |
- (iris_bo_is_external(bo) ? 0 : EXEC_OBJECT_ASYNC),
+ .flags = bo->real.kflags | (written ? EXEC_OBJECT_WRITE : 0),
};
++validation_count;
}