nouveau: adapt to recent gallium changes

7 files changed, 21 insertions, 32 deletions

diff --git a/src/gallium/drivers/nv40/nv40_context.c b/src/gallium/drivers/nv40/nv40_context.c
index 7fcf8b86197..f9c93f7a2d7 100644
--- a/src/gallium/drivers/nv40/nv40_context.c
+++ b/src/gallium/drivers/nv40/nv40_context.c
@@ -7,10 +7,10 @@
 #include "nv40_screen.h"
 
 static void
-nv40_flush(struct pipe_context *pipe, unsigned flags)
+nv40_flush(struct pipe_context *pipe, unsigned flags,
+	   struct pipe_fence_handle **fence)
 {
 	struct nv40_context *nv40 = nv40_context(pipe);
-	struct nouveau_winsys *nvws = nv40->nvws;
 	
 	if (flags & PIPE_FLUSH_TEXTURE_CACHE) {
 		BEGIN_RING(curie, 0x1fd8, 1);
@@ -19,18 +19,7 @@ nv40_flush(struct pipe_context *pipe, unsigned flags)
 		OUT_RING  (1);
 	}
 
-	if (flags & PIPE_FLUSH_WAIT) {
-		nvws->notifier_reset(nv40->screen->sync, 0);
-		BEGIN_RING(curie, 0x104, 1);
-		OUT_RING  (0);
-		BEGIN_RING(curie, 0x100, 1);
-		OUT_RING  (0);
-	}
-
-	FIRE_RING();
-
-	if (flags & PIPE_FLUSH_WAIT)
-		nvws->notifier_wait(nv40->screen->sync, 0, 0, 2000);
+	FIRE_RING(fence);
 }
 
 static void
diff --git a/src/gallium/drivers/nv40/nv40_draw.c b/src/gallium/drivers/nv40/nv40_draw.c
index d05e5ad1936..9cd8fa6a497 100644
--- a/src/gallium/drivers/nv40/nv40_draw.c
+++ b/src/gallium/drivers/nv40/nv40_draw.c
@@ -89,7 +89,7 @@ nv40_render_prim(struct draw_stage *stage, struct prim_header *prim,
 			NOUVEAU_ERR("AIII, missed flush\n");
 			assert(0);
 		}
-		FIRE_RING();
+		FIRE_RING(NULL);
 		nv40_state_emit(nv40);
 	}
 
@@ -275,7 +275,7 @@ nv40_draw_elements_swtnl(struct pipe_context *pipe,
 		ws->buffer_unmap(ws, nv40->constbuf[PIPE_SHADER_VERTEX]);
 
 	draw_flush(nv40->draw);
-	pipe->flush(pipe, 0);
+	pipe->flush(pipe, 0, NULL);
 
 	return TRUE;
 }
diff --git a/src/gallium/drivers/nv40/nv40_query.c b/src/gallium/drivers/nv40/nv40_query.c
index 15961591b96..57f39cfab0c 100644
--- a/src/gallium/drivers/nv40/nv40_query.c
+++ b/src/gallium/drivers/nv40/nv40_query.c
@@ -75,7 +75,7 @@ nv40_query_end(struct pipe_context *pipe, struct pipe_query *pq)
 	BEGIN_RING(curie, NV40TCL_QUERY_GET, 1);
 	OUT_RING  ((0x01 << NV40TCL_QUERY_GET_UNK24_SHIFT) |
 		   ((q->object->start * 32) << NV40TCL_QUERY_GET_OFFSET_SHIFT));
-	FIRE_RING();
+	FIRE_RING(NULL);
 }
 
 static boolean
diff --git a/src/gallium/drivers/nv40/nv40_screen.c b/src/gallium/drivers/nv40/nv40_screen.c
index 75b965bb9d1..e98005f749f 100644
--- a/src/gallium/drivers/nv40/nv40_screen.c
+++ b/src/gallium/drivers/nv40/nv40_screen.c
@@ -266,7 +266,7 @@ nv40_screen_create(struct pipe_winsys *ws, struct nouveau_winsys *nvws,
 
 	so_emit(nvws, so);
 	so_ref(NULL, &so);
-	nvws->push_flush(nvws, 0);
+	nvws->push_flush(nvws, 0, NULL);
 
 	screen->pipe.winsys = ws;
 	screen->pipe.destroy = nv40_screen_destroy;
diff --git a/src/gallium/drivers/nv40/nv40_state.c b/src/gallium/drivers/nv40/nv40_state.c
index 3eafbece309..1417c95e758 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;
 }
 
diff --git a/src/gallium/drivers/nv40/nv40_state_emit.c b/src/gallium/drivers/nv40/nv40_state_emit.c
index a9a9abc9220..74feb6d4bfc 100644
--- a/src/gallium/drivers/nv40/nv40_state_emit.c
+++ b/src/gallium/drivers/nv40/nv40_state_emit.c
@@ -123,7 +123,7 @@ nv40_state_validate(struct nv40_context *nv40)
 			return FALSE;
 
 		/* Attempt to go to hwtnl again */
-		nv40->pipe.flush(&nv40->pipe, 0);
+		nv40->pipe.flush(&nv40->pipe, 0, NULL);
 		nv40->dirty |= (NV40_NEW_VIEWPORT |
 				NV40_NEW_VERTPROG |
 				NV40_NEW_ARRAYS |
@@ -147,7 +147,7 @@ nv40_state_validate_swtnl(struct nv40_context *nv40)
 	/* Setup for swtnl */
 	if (nv40->render_mode == HW) {
 		NOUVEAU_ERR("hw->swtnl 0x%08x\n", nv40->fallback_swtnl);
-		nv40->pipe.flush(&nv40->pipe, 0);
+		nv40->pipe.flush(&nv40->pipe, 0, NULL);
 		nv40->dirty |= (NV40_NEW_VIEWPORT |
 				NV40_NEW_VERTPROG |
 				NV40_NEW_ARRAYS |
diff --git a/src/gallium/drivers/nv40/nv40_vbo.c b/src/gallium/drivers/nv40/nv40_vbo.c
index 4fae10f74b4..b66bf26afb3 100644
--- a/src/gallium/drivers/nv40/nv40_vbo.c
+++ b/src/gallium/drivers/nv40/nv40_vbo.c
@@ -209,7 +209,7 @@ nv40_draw_arrays(struct pipe_context *pipe, unsigned mode, unsigned start,
 	BEGIN_RING(curie, NV40TCL_BEGIN_END, 1);
 	OUT_RING  (0);
 
-	pipe->flush(pipe, 0);
+	pipe->flush(pipe, 0, NULL);
 	return TRUE;
 }
 
@@ -384,7 +384,7 @@ nv40_draw_elements(struct pipe_context *pipe,
 					  mode, start, count);
 	}
 
-	pipe->flush(pipe, 0);
+	pipe->flush(pipe, 0, NULL);
 	return TRUE;
 }