regression solved upstream, removed patch
This commit is contained in:
LW-archlinux
parent
93b1a223c4
commit
c1cadbe192
21
.SRCINFO
21
.SRCINFO
@ -1,7 +1,7 @@
|
||||
pkgbase = mesa-git
|
||||
pkgdesc = an open-source implementation of the OpenGL specification, git version
|
||||
pkgver = 19.2.0_devel.111155.9b9f7030c68
|
||||
pkgrel = 2
|
||||
pkgver = 19.2.0_devel.111185.90e7ce5bde8
|
||||
pkgrel = 1
|
||||
url = https://www.mesa3d.org
|
||||
arch = x86_64
|
||||
license = custom
|
||||
@ -38,13 +38,13 @@ pkgbase = mesa-git
|
||||
depends = glslang
|
||||
depends = llvm-libs-minimal-git
|
||||
optdepends = opengl-man-pages: for the OpenGL API man pages
|
||||
provides = mesa=19.2.0_devel.111155.9b9f7030c68-2
|
||||
provides = vulkan-intel=19.2.0_devel.111155.9b9f7030c68-2
|
||||
provides = vulkan-radeon=19.2.0_devel.111155.9b9f7030c68-2
|
||||
provides = libva-mesa-driver=19.2.0_devel.111155.9b9f7030c68-2
|
||||
provides = mesa-vdpau=19.2.0_devel.111155.9b9f7030c68-2
|
||||
provides = vulkan-driver=19.2.0_devel.111155.9b9f7030c68-2
|
||||
provides = opencl-mesa=19.2.0_devel.111155.9b9f7030c68-2
|
||||
provides = mesa=19.2.0_devel.111185.90e7ce5bde8-1
|
||||
provides = vulkan-intel=19.2.0_devel.111185.90e7ce5bde8-1
|
||||
provides = vulkan-radeon=19.2.0_devel.111185.90e7ce5bde8-1
|
||||
provides = libva-mesa-driver=19.2.0_devel.111185.90e7ce5bde8-1
|
||||
provides = mesa-vdpau=19.2.0_devel.111185.90e7ce5bde8-1
|
||||
provides = vulkan-driver=19.2.0_devel.111185.90e7ce5bde8-1
|
||||
provides = opencl-mesa=19.2.0_devel.111185.90e7ce5bde8-1
|
||||
provides = opengl-driver
|
||||
provides = opencl-driver
|
||||
conflicts = mesa
|
||||
@ -55,13 +55,10 @@ pkgbase = mesa-git
|
||||
conflicts = mesa-vdpau
|
||||
source = mesa::git://anongit.freedesktop.org/mesa/mesa
|
||||
source = LICENSE
|
||||
source = 0001-radeonsi-fix-a-regression-in-si_rebind_buffer.patch
|
||||
md5sums = SKIP
|
||||
md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
|
||||
md5sums = f30002fd49fa44197541ba8fe5faa0e9
|
||||
sha512sums = SKIP
|
||||
sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
|
||||
sha512sums = 505003b745d055bc97bfd26382171759cba57df1bbd4f5a84ce0b02da1b6cd8b4a7c036c25f467c4179dedc441f18480b93454432f4a4d3b09eacae608453b15
|
||||
|
||||
pkgname = mesa-git
|
||||
|
||||
|
||||
@ -1,61 +0,0 @@
|
||||
From a879a55525c0dc5b7f647d96779b475323988363 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
|
||||
Date: Tue, 21 May 2019 14:26:13 -0400
|
||||
Subject: [PATCH] radeonsi: fix a regression in si_rebind_buffer
|
||||
|
||||
Don't update non-buffer images.
|
||||
|
||||
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110701
|
||||
Fixes: 78e35df52aa2f7d770f929a0866a0faa89c261a9 "radeonsi: update buffer descriptors in all contexts after buffer invalidation"
|
||||
Cc: 19.1 <mesa-stable@lists.freedesktop.org>
|
||||
---
|
||||
src/gallium/drivers/radeonsi/si_descriptors.c | 12 ++++++++----
|
||||
1 file changed, 8 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c
|
||||
index 84c9d674981..1cb0ac93caa 100644
|
||||
--- a/src/gallium/drivers/radeonsi/si_descriptors.c
|
||||
+++ b/src/gallium/drivers/radeonsi/si_descriptors.c
|
||||
@@ -1705,7 +1705,8 @@ void si_rebind_buffer(struct si_context *sctx, struct pipe_resource *buf)
|
||||
unsigned i = u_bit_scan(&mask);
|
||||
struct pipe_resource *buffer = samplers->views[i]->texture;
|
||||
|
||||
- if (buffer && (!buf || buffer == buf)) {
|
||||
+ if (buffer && buffer->target == PIPE_BUFFER &&
|
||||
+ (!buf || buffer == buf)) {
|
||||
unsigned desc_slot = si_get_sampler_slot(i);
|
||||
|
||||
si_set_buf_desc_address(si_resource(buffer),
|
||||
@@ -1735,7 +1736,8 @@ void si_rebind_buffer(struct si_context *sctx, struct pipe_resource *buf)
|
||||
unsigned i = u_bit_scan(&mask);
|
||||
struct pipe_resource *buffer = images->views[i].resource;
|
||||
|
||||
- if (buffer && (!buf || buffer == buf)) {
|
||||
+ if (buffer && buffer->target == PIPE_BUFFER &&
|
||||
+ (!buf || buffer == buf)) {
|
||||
unsigned desc_slot = si_get_image_slot(i);
|
||||
|
||||
if (images->views[i].access & PIPE_IMAGE_ACCESS_WRITE)
|
||||
@@ -1766,7 +1768,8 @@ void si_rebind_buffer(struct si_context *sctx, struct pipe_resource *buf)
|
||||
unsigned desc_slot = (*tex_handle)->desc_slot;
|
||||
struct pipe_resource *buffer = view->texture;
|
||||
|
||||
- if (buffer && (!buf || buffer == buf)) {
|
||||
+ if (buffer && buffer->target == PIPE_BUFFER &&
|
||||
+ (!buf || buffer == buf)) {
|
||||
si_set_buf_desc_address(si_resource(buffer),
|
||||
view->u.buf.offset,
|
||||
descs->list +
|
||||
@@ -1793,7 +1796,8 @@ void si_rebind_buffer(struct si_context *sctx, struct pipe_resource *buf)
|
||||
unsigned desc_slot = (*img_handle)->desc_slot;
|
||||
struct pipe_resource *buffer = view->resource;
|
||||
|
||||
- if (buffer && (!buf || buffer == buf)) {
|
||||
+ if (buffer && buffer->target == PIPE_BUFFER &&
|
||||
+ (!buf || buffer == buf)) {
|
||||
if (view->access & PIPE_IMAGE_ACCESS_WRITE)
|
||||
si_mark_image_range_valid(view);
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
19
PKGBUILD
19
PKGBUILD
@ -11,8 +11,8 @@
|
||||
|
||||
pkgname=mesa-git
|
||||
pkgdesc="an open-source implementation of the OpenGL specification, git version"
|
||||
pkgver=19.2.0_devel.111155.9b9f7030c68
|
||||
pkgrel=2
|
||||
pkgver=19.2.0_devel.111185.90e7ce5bde8
|
||||
pkgrel=1
|
||||
arch=('x86_64')
|
||||
makedepends=('git' 'python-mako' 'xorgproto'
|
||||
'libxml2' 'libx11' 'libvdpau' 'libva' 'elfutils' 'libomxil-bellagio' 'libxrandr'
|
||||
@ -25,14 +25,11 @@ conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-drive
|
||||
url="https://www.mesa3d.org"
|
||||
license=('custom')
|
||||
source=('mesa::git://anongit.freedesktop.org/mesa/mesa'
|
||||
'LICENSE'
|
||||
'0001-radeonsi-fix-a-regression-in-si_rebind_buffer.patch')
|
||||
'LICENSE')
|
||||
md5sums=('SKIP'
|
||||
'5c65a0fe315dd347e09b1f2826a1df5a'
|
||||
'f30002fd49fa44197541ba8fe5faa0e9')
|
||||
'5c65a0fe315dd347e09b1f2826a1df5a')
|
||||
sha512sums=('SKIP'
|
||||
'25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
|
||||
'505003b745d055bc97bfd26382171759cba57df1bbd4f5a84ce0b02da1b6cd8b4a7c036c25f467c4179dedc441f18480b93454432f4a4d3b09eacae608453b15')
|
||||
'25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2')
|
||||
|
||||
# MESA_WHICH_LLVM is an environment variable used to determine which llvm package tree is used to built mesa-git against.
|
||||
# Adding a line to makepkg.conf that sets this value is the simplest way to ensure a specific choice.
|
||||
@ -86,8 +83,6 @@ prepare() {
|
||||
if [ -d _build ]; then
|
||||
rm -rf _build
|
||||
fi
|
||||
cd mesa
|
||||
patch -Np1 -i "$srcdir"/0001-radeonsi-fix-a-regression-in-si_rebind_buffer.patch
|
||||
}
|
||||
|
||||
build () {
|
||||
@ -127,15 +122,13 @@ build () {
|
||||
|
||||
meson configure _build
|
||||
if [[ ! $NINJAFLAGS ]]; then
|
||||
ninja -C _build
|
||||
ninja -C _build
|
||||
else
|
||||
ninja "$NINJAFLAGS" -C _build
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
package() {
|
||||
|
||||
DESTDIR="$pkgdir" ninja -C _build install
|
||||
|
||||
# indirect rendering
|
||||
|
||||
Loading…
Reference in New Issue
Block a user