Mesa (staging/20.1): nouveau: fix pointer-sign warning

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: 7b00a3694cc439c035ecd4e4376e8e16ff412345
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7b00a3694cc439c035ecd4e4376e8e16ff412345

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Fri Jul  3 11:37:45 2020 +1000

nouveau: fix pointer-sign warning

Fixes: e630271e0ec3 ("mesa: don't ever set NullBufferObj in gl_vertex_array_binding")
Reviewed-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5730>
(cherry picked from commit ec8fdf8579d7f95257316d29a6e58ccdf6e5aaba)

---

 .pick_status.json                            | 2 +-
 src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 805fec8684f..62a82689934 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -328,7 +328,7 @@
         "description": "nouveau: fix pointer-sign warning",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "e630271e0ec3eee7d921d76d3924873f6ee6b59b"
     },
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
index 8a7d0f4a338..e6274d45cf4 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
@@ -346,7 +346,7 @@ vbo_bind_vertices(struct gl_context *ctx, const struct tnl_vertex_array *arrays,
                            sp = (char *)ADD_POINTERS(
 				nouveau_bufferobj_sys(obj), p) + delta;
                         } else {
-                           sp = p + delta;
+                           sp = (char *)(p + delta);
                         }
 			char *dp  = nouveau_get_scratch(ctx, n * a->stride,
 							&bo[i], &offset[i]);