kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

graphics/mesa-devel: update to 20.2.b.3846

Browse source 
Changes:	78a420ce46...5d5f3e3a47
This commit is contained in:
Jan Beich 2020-11-05 00:41:03 +00:00
parent 9f5c0065f0
commit a416082cb9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=554111
3 changed files with 5 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
graphics/mesa-devel/Makefile
View file

@ -1,8 +1,8 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= mesa PORTNAME= mesa
DISTVERSION= 20.2-branchpoint-3686 DISTVERSION= 20.2-branchpoint-3846
DISTVERSIONSUFFIX= -g78a420ce467 DISTVERSIONSUFFIX= -g5d5f3e3a477
CATEGORIES= graphics CATEGORIES= graphics
PKGNAMESUFFIX= -devel PKGNAMESUFFIX= -devel

6
graphics/mesa-devel/distinfo
View file

@ -1,6 +1,6 @@
TIMESTAMP = 1604359273 TIMESTAMP = 1604521488
SHA256 (mesa3d-mesa-20.2-branchpoint-3686-g78a420ce467_GH0.tar.gz) = 132cae454e497fb628d0b55c6d254101d0f8dbc5e00c436c83cae0b340fb500a SHA256 (mesa3d-mesa-20.2-branchpoint-3846-g5d5f3e3a477_GH0.tar.gz) = 01626ec99df102fc82a1a58abbf5ea58accbd233fdcc6c3db4f10b64ef36ad59
SIZE (mesa3d-mesa-20.2-branchpoint-3686-g78a420ce467_GH0.tar.gz) = 21807974 SIZE (mesa3d-mesa-20.2-branchpoint-3846-g5d5f3e3a477_GH0.tar.gz) = 21828998
SHA256 (9f52b5177728.patch) = d4f380b8872726b88c1aa75d0a9cb63adf79144a7c34da6b7fd525ea417d2b73 SHA256 (9f52b5177728.patch) = d4f380b8872726b88c1aa75d0a9cb63adf79144a7c34da6b7fd525ea417d2b73
SIZE (9f52b5177728.patch) = 832 SIZE (9f52b5177728.patch) = 832
SHA256 (2b9168cf579b.patch) = 2c664de141894b21368abab34fb1a1671d68845551520c9acb7dd5f1d0125072 SHA256 (2b9168cf579b.patch) = 2c664de141894b21368abab34fb1a1671d68845551520c9acb7dd5f1d0125072

45
graphics/mesa-devel/files/patch-revert
View file

@ -1,45 +0,0 @@
Revert https://gitlab.freedesktop.org/mesa/mesa/-/commit/13859c769f0e
due to https://gitlab.freedesktop.org/mesa/mesa/-/issues/3713
--- src/gallium/frontends/dri/dri2.c.orig 2020-10-31 00:18:11 UTC
+++ src/gallium/frontends/dri/dri2.c
@@ -1379,28 +1379,18 @@ static __DRIimage *
dri2_from_planar(__DRIimage *image, int plane, void *loaderPrivate)
{
__DRIimage *img;
- struct pipe_resource *tex = image->texture;
- int i;
if (plane < 0) {
return NULL;
} else if (plane > 0) {
uint64_t planes;
- if (dri2_resource_get_param(image, PIPE_RESOURCE_PARAM_NPLANES, 0,
- &planes) &&
+ if (!dri2_resource_get_param(image, PIPE_RESOURCE_PARAM_NPLANES, 0,
+ &planes) ||
plane >= planes) {
return NULL;
}
}
- if (tex->next) {
- for (i = 0; i < plane; i++) {
- tex = tex->next;
- if (!tex)
- return NULL;
- }
- }
-
if (image->dri_components == 0) {
uint64_t modifier;
if (!dri2_resource_get_param(image, PIPE_RESOURCE_PARAM_MODIFIER, 0,
@@ -1413,8 +1403,6 @@ dri2_from_planar(__DRIimage *image, int plane, void *l
img = dri2_dup_image(image, loaderPrivate);
if (img == NULL)
return NULL;
-
- pipe_resource_reference(&img->texture, tex);
if (img->texture->screen->resource_changed)
img->texture->screen->resource_changed(img->texture->screen,