Mesa (master): nvfx: fix warnings

[Luca Barbieri]

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

Author: Luca Barbieri <luca at luca-barbieri.com>
Date:   Sat Aug 21 22:48:29 2010 +0200

nvfx: fix warnings

---

 src/gallium/drivers/nvfx/nvfx_context.h  |    2 +-
 src/gallium/drivers/nvfx/nvfx_vbo.c      |    1 -
 src/gallium/drivers/nvfx/nvfx_vertprog.c |    4 +---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/nvfx/nvfx_context.h b/src/gallium/drivers/nvfx/nvfx_context.h
index 04447da..83c44ef 100644
--- a/src/gallium/drivers/nvfx/nvfx_context.h
+++ b/src/gallium/drivers/nvfx/nvfx_context.h
@@ -312,7 +312,7 @@ extern void nvfx_vertprog_destroy(struct nvfx_context *,
 extern void nvfx_push_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info);
 
 /* must WAIT_RING(chan, ncomp + 1) or equivalent beforehand! */
-static inline void nvfx_emit_vtx_attr(struct nouveau_channel* chan, unsigned attrib, float* v, unsigned ncomp)
+static inline void nvfx_emit_vtx_attr(struct nouveau_channel* chan, unsigned attrib, const float* v, unsigned ncomp)
 {
 	switch (ncomp) {
 	case 4:
diff --git a/src/gallium/drivers/nvfx/nvfx_vbo.c b/src/gallium/drivers/nvfx/nvfx_vbo.c
index abd7706..d1e7199 100644
--- a/src/gallium/drivers/nvfx/nvfx_vbo.c
+++ b/src/gallium/drivers/nvfx/nvfx_vbo.c
@@ -419,7 +419,6 @@ nvfx_vtxelts_state_create(struct pipe_context *pipe,
 			  unsigned num_elements,
 			  const struct pipe_vertex_element *elements)
 {
-	struct nvfx_context* nvfx = nvfx_context(pipe);
 	struct nvfx_vtxelt_state *cso = CALLOC_STRUCT(nvfx_vtxelt_state);
         struct translate_key transkey;
         unsigned per_vertex_size[16];
diff --git a/src/gallium/drivers/nvfx/nvfx_vertprog.c b/src/gallium/drivers/nvfx/nvfx_vertprog.c
index 7cccffe..b5dde25 100644
--- a/src/gallium/drivers/nvfx/nvfx_vertprog.c
+++ b/src/gallium/drivers/nvfx/nvfx_vertprog.c
@@ -801,7 +801,6 @@ nvfx_vertprog_prepare(struct nvfx_context* nvfx, struct nvfx_vpc *vpc)
 	int high_temp = -1, high_addr = -1, nr_imm = 0, i;
 	struct util_semantic_set set;
 	unsigned char sem_layout[8];
-	unsigned sem_layout_size;
 	unsigned num_outputs;
 
 	num_outputs = util_semantic_set_from_program_file(&set, vpc->vp->pipe.tokens, TGSI_FILE_OUTPUT);
@@ -1061,7 +1060,6 @@ out_err:
 boolean
 nvfx_vertprog_validate(struct nvfx_context *nvfx)
 {
-	struct pipe_context *pipe = &nvfx->pipe;
 	struct nvfx_screen *screen = nvfx->screen;
 	struct nouveau_channel *chan = screen->base.channel;
 	struct nouveau_grobj *eng3d = screen->eng3d;
@@ -1200,7 +1198,7 @@ nvfx_vertprog_validate(struct nvfx_context *nvfx)
 		float *map = NULL;
 
 		if (constbuf)
-			map = nvfx_buffer(constbuf)->data;
+			map = (float*)nvfx_buffer(constbuf)->data;
 
 		for (i = 0; i < vp->nr_consts; i++) {
 			struct nvfx_vertex_program_data *vpd = &vp->consts[i];