From: Ben Skeggs <skeggsb@gmail.com>
Date: Sun, 2 Mar 2008 05:39:24 +0000 (+1100)
Subject: nouveau: silence some warnings
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a5966c8b28702bba1e4eb4bb4aec2247c90fcfa2;p=mesa.git

nouveau: silence some warnings
---

diff --git a/src/gallium/winsys/dri/nouveau/nouveau_local.h b/src/gallium/winsys/dri/nouveau/nouveau_local.h
index f7d91fc7487..8a52f26714f 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_local.h
+++ b/src/gallium/winsys/dri/nouveau/nouveau_local.h
@@ -2,6 +2,7 @@
 #define __NOUVEAU_LOCAL_H__
 
 #include "pipe/p_compiler.h"
+#include "nouveau_winsys_pipe.h"
 #include <stdio.h>
 
 struct pipe_buffer;
@@ -76,8 +77,9 @@ static INLINE void
 OUT_RELOC(struct nouveau_channel *chan, struct pipe_buffer *buf,
 	  unsigned data, unsigned flags, unsigned vor, unsigned tor)
 {
-	nouveau_pipe_emit_reloc(chan, chan->pushbuf->cur++, buf,
-				data, flags, vor, tor);
+	nouveau_pushbuf_emit_reloc(chan, chan->pushbuf->cur++,
+				   nouveau_buffer(buf)->bo,
+				   data, flags, vor, tor);
 }
 
 /* Raw data + flags depending on FB/TT buffer */
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_winsys.c b/src/gallium/winsys/dri/nouveau/nouveau_winsys.c
index 87619bdcfb4..dc7c4c3d71d 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_winsys.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_winsys.c
@@ -58,7 +58,7 @@ nouveau_pipe_surface_fill(struct nouveau_winsys *nvws, struct pipe_surface *dst,
 	return 0;
 }
 
-int
+static int
 nouveau_pipe_emit_reloc(struct nouveau_channel *chan, void *ptr,
 			struct pipe_buffer *buf, uint32_t data,
 			uint32_t flags, uint32_t vor, uint32_t tor)
@@ -77,7 +77,6 @@ nouveau_pipe_create(struct nouveau_context *nv)
 					  unsigned chipset);
 	struct pipe_context *(*hw_create)(struct pipe_screen *, unsigned);
 	struct pipe_winsys *ws;
-	struct pipe_screen *pscreen;
 
 	if (!nvws)
 		return NULL;