Mesa (master): nv50, nvc0: fix must_check warning of util_dynarray_resize_bytes

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: c9091f1f24394499100b475e232f6e6c54d40650
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c9091f1f24394499100b475e232f6e6c54d40650

Author: Karol Herbst <kherbst at redhat.com>
Date:   Fri Sep 20 20:27:20 2019 +0200

nv50, nvc0: fix must_check warning of util_dynarray_resize_bytes

Signed-off-by: Karol Herbst <kherbst at redhat.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund at 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>

---

 src/gallium/drivers/nouveau/nv50/nv50_state.c | 10 +++++++---
 src/gallium/drivers/nouveau/nvc0/nvc0_state.c | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nv50/nv50_state.c b/src/gallium/drivers/nouveau/nv50/nv50_state.c
index 6488c71f4ad..c176fa6fe93 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_state.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_state.c
@@ -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) {
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
index 49546e5de68..d53a6cb2a26 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
@@ -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) {