fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 11:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: stop overwriting buffer map pointers for stream uploader

Browse source 
this breaks the driver!

the uploader always maps its own pointer, so modifying that at any
point just explodes things later

Fixes: d179c5d28e ("zink: implement threaded context")

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10787>
(cherry picked from commit 8e2ac24482)
This commit is contained in:
Mike Blumenkrantz 2021-05-13 12:38:46 -04:00 • committed by Eric Engestrom
parent 53d0c0d735
commit abd4ab6ffa
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -310,7 +310,7 @@
"description": "zink: stop overwriting buffer map pointers for stream uploader",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "d179c5d28e6ae86dd95d906fff8197e35270dad8"
},

1
src/gallium/drivers/zink/zink_resource.c
View file

@ -883,7 +883,6 @@ buffer_transfer_map(struct zink_context *ctx, struct zink_resource *res, unsigne
(struct pipe_resource **)&trans->staging_res, (void **)&ptr);
res = zink_resource(trans->staging_res);
trans->offset = offset;
res->obj->map = ptr;
} else {
/* At this point, the buffer is always idle (we checked it above). */
usage |= PIPE_MAP_UNSYNCHRONIZED;