fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 20:28:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nvfx: fix warnings

Browse source
This commit is contained in:
Luca Barbieri 2010-08-21 22:48:29 +02:00
parent 0d96cbe4a5
commit 11d27871a7
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/nvfx/nvfx_context.h
View file

@ -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:

1
src/gallium/drivers/nvfx/nvfx_vbo.c
View file

@ -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];

4
src/gallium/drivers/nvfx/nvfx_vertprog.c
View file

@ -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];