nouveau: quicky-port to gallium changes

4 files changed, 7 insertions, 31 deletions

diff --git a/src/mesa/pipe/nv50/nv50_context.h b/src/mesa/pipe/nv50/nv50_context.h
index c43202c3d5..5491c0cbb5 100644
--- a/src/mesa/pipe/nv50/nv50_context.h
+++ b/src/mesa/pipe/nv50/nv50_context.h
@@ -45,7 +45,7 @@ extern struct draw_stage *nv50_draw_render_stage(struct nv50_context *nv50);
 extern boolean nv50_draw_arrays(struct pipe_context *, unsigned mode,
 				unsigned start, unsigned count);
 extern boolean nv50_draw_elements(struct pipe_context *pipe,
-				  struct pipe_buffer_handle *indexBuffer,
+				  struct pipe_buffer *indexBuffer,
 				  unsigned indexSize,
 				  unsigned mode, unsigned start,
 				  unsigned count);
diff --git a/src/mesa/pipe/nv50/nv50_draw.c b/src/mesa/pipe/nv50/nv50_draw.c
index 9708892028..85d347f5e0 100644
--- a/src/mesa/pipe/nv50/nv50_draw.c
+++ b/src/mesa/pipe/nv50/nv50_draw.c
@@ -9,33 +9,26 @@ struct nv50_draw_stage {
 };
 
 static void
-nv50_draw_begin(struct draw_stage *draw)
-{
-	NOUVEAU_ERR("\n");
-}
-
-static void
-nv50_draw_end(struct draw_stage *draw)
+nv50_draw_point(struct draw_stage *draw, struct prim_header *prim)
 {
 	NOUVEAU_ERR("\n");
 }
 
 static void
-nv50_draw_point(struct draw_stage *draw, struct prim_header *prim)
+nv50_draw_line(struct draw_stage *draw, struct prim_header *prim)
 {
 	NOUVEAU_ERR("\n");
 }
 
 static void
-nv50_draw_line(struct draw_stage *draw, struct prim_header *prim)
+nv50_draw_tri(struct draw_stage *draw, struct prim_header *prim)
 {
 	NOUVEAU_ERR("\n");
 }
 
 static void
-nv50_draw_tri(struct draw_stage *draw, struct prim_header *prim)
+nv50_draw_flush(struct draw_stage *draw, unsigned flags)
 {
-	NOUVEAU_ERR("\n");
 }
 
 static void
@@ -51,11 +44,10 @@ nv50_draw_render_stage(struct nv50_context *nv50)
 
 	nv50draw->nv50 = nv50;
 	nv50draw->draw.draw = nv50->draw;
-	nv50draw->draw.begin = nv50_draw_begin;
 	nv50draw->draw.point = nv50_draw_point;
 	nv50draw->draw.line = nv50_draw_line;
 	nv50draw->draw.tri = nv50_draw_tri;
-	nv50draw->draw.end = nv50_draw_end;
+	nv50draw->draw.flush = nv50_draw_flush;
 	nv50draw->draw.reset_stipple_counter = nv50_draw_reset_stipple_counter;
 
 	return &nv50draw->draw;
diff --git a/src/mesa/pipe/nv50/nv50_surface.c b/src/mesa/pipe/nv50/nv50_surface.c
index d207994688..cfb370da77 100644
--- a/src/mesa/pipe/nv50/nv50_surface.c
+++ b/src/mesa/pipe/nv50/nv50_surface.c
@@ -43,19 +43,6 @@ nv50_get_tex_surface(struct pipe_context *pipe,
 }
 
 static void
-nv50_surface_data(struct pipe_context *pipe, struct pipe_surface *dest,
-		  unsigned destx, unsigned desty, const void *src,
-		  unsigned src_stride, unsigned srcx, unsigned srcy,
-		  unsigned width, unsigned height)
-{
-	struct nv50_context *nv50 = (struct nv50_context *)pipe;
-	struct nouveau_winsys *nvws = nv50->nvws;
-
-	nvws->surface_data(nvws, dest, destx, desty, src, src_stride,
-			   srcx, srcy, width, height);
-}
-
-static void
 nv50_surface_copy(struct pipe_context *pipe, struct pipe_surface *dest,
 		  unsigned destx, unsigned desty, struct pipe_surface *src,
 		  unsigned srcx, unsigned srcy, unsigned width, unsigned height)
@@ -82,9 +69,6 @@ void
 nv50_init_surface_functions(struct nv50_context *nv50)
 {
    nv50->pipe.get_tex_surface = nv50_get_tex_surface;
-   nv50->pipe.get_tile = pipe_get_tile_raw;
-   nv50->pipe.put_tile = pipe_put_tile_raw;
-   nv50->pipe.surface_data = nv50_surface_data;
    nv50->pipe.surface_copy = nv50_surface_copy;
    nv50->pipe.surface_fill = nv50_surface_fill;
 }
diff --git a/src/mesa/pipe/nv50/nv50_vbo.c b/src/mesa/pipe/nv50/nv50_vbo.c
index 0c9d2806d7..6c0dc23a43 100644
--- a/src/mesa/pipe/nv50/nv50_vbo.c
+++ b/src/mesa/pipe/nv50/nv50_vbo.c
@@ -15,7 +15,7 @@ nv50_draw_arrays(struct pipe_context *pipe, unsigned mode, unsigned start,
 
 boolean
 nv50_draw_elements(struct pipe_context *pipe,
-		   struct pipe_buffer_handle *indexBuffer, unsigned indexSize,
+		   struct pipe_buffer *indexBuffer, unsigned indexSize,
 		   unsigned mode, unsigned start, unsigned count)
 {
 	NOUVEAU_ERR("unimplemented\n");