summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nv10/nv10_state.c
diff options
context:
space:
mode:
authorBen Skeggs <[email protected]>2008-03-30 20:32:22 +1000
committerBen Skeggs <[email protected]>2008-03-30 20:40:27 +1000
commitbbefb541ad94382debb0f7a8daa636729799a31a (patch)
tree3f24aa5ffef5111705c05b395134a433d276658b /src/gallium/drivers/nv10/nv10_state.c
parent03c60e0fb691d39a168a8825ace7150ef3a20e02 (diff)
nouveau: adapt to recent gallium changes
Diffstat (limited to 'src/gallium/drivers/nv10/nv10_state.c')
-rw-r--r--src/gallium/drivers/nv10/nv10_state.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/gallium/drivers/nv10/nv10_state.c b/src/gallium/drivers/nv10/nv10_state.c
index d7c445f1b39..1ff01de1060 100644
--- a/src/gallium/drivers/nv10/nv10_state.c
+++ b/src/gallium/drivers/nv10/nv10_state.c
@@ -633,24 +633,22 @@ nv10_set_viewport_state(struct pipe_context *pipe,
}
static void
-nv10_set_vertex_buffer(struct pipe_context *pipe, unsigned index,
- const struct pipe_vertex_buffer *vb)
+nv10_set_vertex_buffers(struct pipe_context *pipe, unsigned count,
+ const struct pipe_vertex_buffer *vb)
{
struct nv10_context *nv10 = nv10_context(pipe);
- nv10->vtxbuf[index] = *vb;
-
+ memcpy(nv10->vtxbuf, vb, sizeof(*vb) * count);
nv10->dirty |= NV10_NEW_ARRAYS;
}
static void
-nv10_set_vertex_element(struct pipe_context *pipe, unsigned index,
- const struct pipe_vertex_element *ve)
+nv10_set_vertex_elements(struct pipe_context *pipe, unsigned count,
+ const struct pipe_vertex_element *ve)
{
struct nv10_context *nv10 = nv10_context(pipe);
- nv10->vtxelt[index] = *ve;
-
+ memcpy(nv10->vtxelt, ve, sizeof(*ve) * count);
nv10->dirty |= NV10_NEW_ARRAYS;
}
@@ -693,7 +691,7 @@ nv10_init_state_functions(struct nv10_context *nv10)
nv10->pipe.set_scissor_state = nv10_set_scissor_state;
nv10->pipe.set_viewport_state = nv10_set_viewport_state;
- nv10->pipe.set_vertex_buffer = nv10_set_vertex_buffer;
- nv10->pipe.set_vertex_element = nv10_set_vertex_element;
+ nv10->pipe.set_vertex_buffers = nv10_set_vertex_buffers;
+ nv10->pipe.set_vertex_elements = nv10_set_vertex_elements;
}