nouveau: adapt to recent gallium changes

1 files changed, 10 insertions, 10 deletions

diff --git a/src/gallium/drivers/nv40/nv40_state.c b/src/gallium/drivers/nv40/nv40_state.c
index 3eafbece30..1417c95e75 100644
--- a/src/gallium/drivers/nv40/nv40_state.c
+++ b/src/gallium/drivers/nv40/nv40_state.c
@@ -660,26 +660,26 @@ nv40_set_viewport_state(struct pipe_context *pipe,
 }
 
 static void
-nv40_set_vertex_buffer(struct pipe_context *pipe, unsigned index,
-		       const struct pipe_vertex_buffer *vb)
+nv40_set_vertex_buffers(struct pipe_context *pipe, unsigned count,
+			const struct pipe_vertex_buffer *vb)
 {
 	struct nv40_context *nv40 = nv40_context(pipe);
 
-	draw_set_vertex_buffer(nv40->draw, index, vb);
+	draw_set_vertex_buffers(nv40->draw, count, vb);
 
-	nv40->vtxbuf[index] = *vb;
+	memcpy(nv40->vtxbuf, vb, sizeof(*vb) * count);
 	nv40->dirty |= NV40_NEW_ARRAYS;
 }
 
 static void
-nv40_set_vertex_element(struct pipe_context *pipe, unsigned index,
-			const struct pipe_vertex_element *ve)
+nv40_set_vertex_elements(struct pipe_context *pipe, unsigned count,
+			 const struct pipe_vertex_element *ve)
 {
 	struct nv40_context *nv40 = nv40_context(pipe);
 
-	draw_set_vertex_element(nv40->draw, index, ve);
+	draw_set_vertex_elements(nv40->draw, count, ve);
 
-	nv40->vtxelt[index] = *ve;
+	memcpy(nv40->vtxelt, ve, sizeof(*ve) * count);
 	nv40->dirty |= NV40_NEW_ARRAYS;
 }
 
@@ -722,7 +722,7 @@ nv40_init_state_functions(struct nv40_context *nv40)
 	nv40->pipe.set_scissor_state = nv40_set_scissor_state;
 	nv40->pipe.set_viewport_state = nv40_set_viewport_state;
 
-	nv40->pipe.set_vertex_buffer = nv40_set_vertex_buffer;
-	nv40->pipe.set_vertex_element = nv40_set_vertex_element;
+	nv40->pipe.set_vertex_buffers = nv40_set_vertex_buffers;
+	nv40->pipe.set_vertex_elements = nv40_set_vertex_elements;
 }