From 9aaf00d9462b8f468e0f033a37c10df04efe32d2 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Tue, 3 Sep 2019 21:23:13 +0100 Subject: [PATCH] Update to 19.1.6 --- ...ompute-preference-for-all-multimedia.patch | 108 ------------------ mesa.spec | 8 +- sources | 2 +- 3 files changed, 5 insertions(+), 113 deletions(-) delete mode 100644 0001-gallium-vl-use-compute-preference-for-all-multimedia.patch diff --git a/0001-gallium-vl-use-compute-preference-for-all-multimedia.patch b/0001-gallium-vl-use-compute-preference-for-all-multimedia.patch deleted file mode 100644 index 37c26e0..0000000 --- a/0001-gallium-vl-use-compute-preference-for-all-multimedia.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 9048af76b49c6c8118e4dd6c9e8fdedcaaa7cb27 Mon Sep 17 00:00:00 2001 -From: Ilia Mirkin -Date: Sat, 17 Aug 2019 12:17:37 -0400 -Subject: [PATCH] gallium/vl: use compute preference for all multimedia, not - just blit - -The compute paths in vl are a bit AMD-specific. For example, they (on -nouveau), try to use a BGRX8 image format, which is not supported. -Fixing all this is probably possible, but since the compute paths aren't -in any way better, it's difficult to care. - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111213 -Fixes: 9364d66cb7 (gallium/auxiliary/vl: Add video compositor compute shader render) -Signed-off-by: Ilia Mirkin ---- - src/gallium/auxiliary/util/u_screen.c | 2 +- - src/gallium/auxiliary/vl/vl_compositor.c | 2 +- - src/gallium/docs/source/screen.rst | 4 ++-- - src/gallium/drivers/radeonsi/si_get.c | 4 ++-- - src/gallium/include/pipe/p_defines.h | 2 +- - src/gallium/state_trackers/va/postproc.c | 2 +- - 6 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/src/gallium/auxiliary/util/u_screen.c b/src/gallium/auxiliary/util/u_screen.c -index 88c33c056e9..3f64e466d7f 100644 ---- a/src/gallium/auxiliary/util/u_screen.c -+++ b/src/gallium/auxiliary/util/u_screen.c -@@ -326,7 +326,7 @@ u_pipe_screen_get_param_defaults(struct pipe_screen *pscreen, - case PIPE_CAP_TGSI_ATOMFADD: - case PIPE_CAP_TGSI_SKIP_SHRINK_IO_ARRAYS: - case PIPE_CAP_IMAGE_LOAD_FORMATTED: -- case PIPE_CAP_PREFER_COMPUTE_BLIT_FOR_MULTIMEDIA: -+ case PIPE_CAP_PREFER_COMPUTE_FOR_MULTIMEDIA: - return 0; - - case PIPE_CAP_MAX_GS_INVOCATIONS: -diff --git a/src/gallium/auxiliary/vl/vl_compositor.c b/src/gallium/auxiliary/vl/vl_compositor.c -index 193a073756a..a5ab3e06b5e 100644 ---- a/src/gallium/auxiliary/vl/vl_compositor.c -+++ b/src/gallium/auxiliary/vl/vl_compositor.c -@@ -757,7 +757,7 @@ vl_compositor_init(struct vl_compositor *c, struct pipe_context *pipe) - - memset(c, 0, sizeof(*c)); - -- c->pipe_cs_composit_supported = pipe->screen->get_param(pipe->screen, PIPE_CAP_COMPUTE) && -+ c->pipe_cs_composit_supported = pipe->screen->get_param(pipe->screen, PIPE_CAP_PREFER_COMPUTE_FOR_MULTIMEDIA) && - pipe->screen->get_param(pipe->screen, PIPE_CAP_TGSI_TEX_TXF_LZ) && - pipe->screen->get_param(pipe->screen, PIPE_CAP_TGSI_DIV); - -diff --git a/src/gallium/docs/source/screen.rst b/src/gallium/docs/source/screen.rst -index 2b402cc91e1..690e534d206 100644 ---- a/src/gallium/docs/source/screen.rst -+++ b/src/gallium/docs/source/screen.rst -@@ -521,8 +521,8 @@ The integer capabilities: - execution. 0 = throttling is disabled. - * ``PIPE_CAP_DMABUF``: Whether Linux DMABUF handles are supported by - resource_from_handle and resource_get_handle. --* ``PIPE_CAP_PREFER_COMPUTE_BLIT_FOR_MULTIMEDIA``: Whether VDPAU, VAAPI, and -- OpenMAX should use a compute-based blit instead of pipe_context::blit. -+* ``PIPE_CAP_PREFER_COMPUTE_FOR_MULTIMEDIA``: Whether VDPAU, VAAPI, and -+ OpenMAX should use a compute-based blit instead of pipe_context::blit and compute pipeline for compositing images. - * ``PIPE_CAP_TGSI_DIV``: Whether opcode DIV is supported - - .. _pipe_capf: -diff --git a/src/gallium/drivers/radeonsi/si_get.c b/src/gallium/drivers/radeonsi/si_get.c -index db7ed684f19..71082ec523c 100644 ---- a/src/gallium/drivers/radeonsi/si_get.c -+++ b/src/gallium/drivers/radeonsi/si_get.c -@@ -155,8 +155,8 @@ static int si_get_param(struct pipe_screen *pscreen, enum pipe_cap param) - case PIPE_CAP_TGSI_FS_FBFETCH: - case PIPE_CAP_COMPUTE_GRID_INFO_LAST_BLOCK: - case PIPE_CAP_IMAGE_LOAD_FORMATTED: -- case PIPE_CAP_PREFER_COMPUTE_BLIT_FOR_MULTIMEDIA: -- case PIPE_CAP_TGSI_DIV: -+ case PIPE_CAP_PREFER_COMPUTE_FOR_MULTIMEDIA: -+ case PIPE_CAP_TGSI_DIV: - return 1; - - case PIPE_CAP_RESOURCE_FROM_USER_MEMORY: -diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h -index b6cf9c76766..8b9a2cd07f9 100644 ---- a/src/gallium/include/pipe/p_defines.h -+++ b/src/gallium/include/pipe/p_defines.h -@@ -882,7 +882,7 @@ enum pipe_cap - PIPE_CAP_IMAGE_LOAD_FORMATTED, - PIPE_CAP_MAX_FRAMES_IN_FLIGHT, - PIPE_CAP_DMABUF, -- PIPE_CAP_PREFER_COMPUTE_BLIT_FOR_MULTIMEDIA, -+ PIPE_CAP_PREFER_COMPUTE_FOR_MULTIMEDIA, - PIPE_CAP_TGSI_DIV, - }; - -diff --git a/src/gallium/state_trackers/va/postproc.c b/src/gallium/state_trackers/va/postproc.c -index fbc55b7714b..3431b1b48c7 100644 ---- a/src/gallium/state_trackers/va/postproc.c -+++ b/src/gallium/state_trackers/va/postproc.c -@@ -222,7 +222,7 @@ static VAStatus vlVaPostProcBlit(vlVaDriver *drv, vlVaContext *context, - blit.filter = PIPE_TEX_MIPFILTER_LINEAR; - - if (drv->pipe->screen->get_param(drv->pipe->screen, -- PIPE_CAP_PREFER_COMPUTE_BLIT_FOR_MULTIMEDIA)) -+ PIPE_CAP_PREFER_COMPUTE_FOR_MULTIMEDIA)) - util_compute_blit(drv->pipe, &blit, &context->blit_cs); - else - drv->pipe->blit(drv->pipe, &blit); --- -2.21.0 - diff --git a/mesa.spec b/mesa.spec index d662c22..318a6c4 100644 --- a/mesa.spec +++ b/mesa.spec @@ -49,7 +49,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.1.5 +%global ver 19.1.6 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -69,9 +69,6 @@ Patch3: 0003-evergreen-big-endian.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1560481 Patch7: 0001-gallium-Disable-rgb10-configs-by-default.patch -# fix nouveau video -Patch10: 0001-gallium-vl-use-compute-preference-for-all-multimedia.patch - BuildRequires: meson >= 0.45 BuildRequires: gcc BuildRequires: gcc-c++ @@ -645,6 +642,9 @@ popd %endif %changelog +* Tue Sep 03 2019 Pete Walter - 19.1.6-1 +- Update to 19.1.6 + * Fri Aug 23 2019 Pete Walter - 19.1.5-1 - Update to 19.1.5 diff --git a/sources b/sources index fef1b98..c036098 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.1.5.tar.xz) = 4d4b3733c13e5c9b3172127f2565b827dc46aab69bdc86791c457ad137a5571c51e3c3a26d5a99e11fe552829a1220028a3968f3086959e038c615f2d75675a4 +SHA512 (mesa-19.1.6.tar.xz) = 399ce97a293769893ef9a4a6af1f77c7d835f5405bdbc03bbf9b73e052e4ff3b43dec5dafd6b9fedaaf2c59531aeccaa0f685a8bfdc5719a26c3815fc7f68024