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

nv50, nvc0: fix must_check warning of util_dynarray_resize_bytes

Browse source 
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4330>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4330>
This commit is contained in:
Karol Herbst 2019-09-20 20:27:20 +02:00 • committed by Marge Bot
parent f4a4d4607e
commit c9091f1f24
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/drivers/nouveau/nv50/nv50_state.c
View file

@ -1267,9 +1267,13 @@ nv50_set_global_bindings(struct pipe_context *pipe,
if (nv50->global_residents.size <= (end * sizeof(struct pipe_resource *))) {
const unsigned old_size = nv50->global_residents.size;
util_dynarray_resize(&nv50->global_residents, struct pipe_resource *, end);
memset((uint8_t *)nv50->global_residents.data + old_size, 0,
nv50->global_residents.size - old_size);
if (util_dynarray_resize(&nv50->global_residents, struct pipe_resource *, end)) {
memset((uint8_t *)nv50->global_residents.data + old_size, 0,
nv50->global_residents.size - old_size);
} else {
NOUVEAU_ERR("Could not resize global residents array\n");
return;
}
}
if (resources) {

10
src/gallium/drivers/nouveau/nvc0/nvc0_state.c
View file

@ -1384,9 +1384,13 @@ nvc0_set_global_bindings(struct pipe_context *pipe,
if (nvc0->global_residents.size <= (end * sizeof(struct pipe_resource *))) {
const unsigned old_size = nvc0->global_residents.size;
util_dynarray_resize(&nvc0->global_residents, struct pipe_resource *, end);
memset((uint8_t *)nvc0->global_residents.data + old_size, 0,
nvc0->global_residents.size - old_size);
if (util_dynarray_resize(&nvc0->global_residents, struct pipe_resource *, end)) {
memset((uint8_t *)nvc0->global_residents.data + old_size, 0,
nvc0->global_residents.size - old_size);
} else {
NOUVEAU_ERR("Could not resize global residents array\n");
return;
}
}
if (resources) {