diff options
| author | Luca Barbieri <luca@luca-barbieri.com> | 2010-08-21 22:48:29 +0200 |
|---|---|---|
| committer | Luca Barbieri <luca@luca-barbieri.com> | 2010-08-21 23:09:43 +0200 |
| commit | 11d27871a79fb7ffcf0e139a8c04d90991969023 (patch) | |
| tree | 5c7e882e6fdad8411e7cff2518309d04331f43c2 /src/gallium/drivers/nvfx/nvfx_vertprog.c | |
| parent | 0d96cbe4a5e0a39c17db007f3815868c6a766382 (diff) | |
nvfx: fix warnings
Diffstat (limited to 'src/gallium/drivers/nvfx/nvfx_vertprog.c')
| -rw-r--r-- | src/gallium/drivers/nvfx/nvfx_vertprog.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gallium/drivers/nvfx/nvfx_vertprog.c b/src/gallium/drivers/nvfx/nvfx_vertprog.c index 7cccffe0ff..b5dde2592e 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]; |