nv50: rework miptree/texture/texsurf code a bit

[mesa.git] / src / gallium / drivers / nv50 / nv50_context.c

diff --git a/src/gallium/drivers/nv50/nv50_context.c b/src/gallium/drivers/nv50/nv50_context.c
index 980d066c8443d65ea0ec5f6b18f5390b7be13b82..a225c4bf728a42ebe122b7bcfe3cc9a29898cbcf 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_context.c
+++ b/src/gallium/drivers/nv50/nv50_context.c
@@ -7,24 +7,12 @@
 #include "nv50_screen.h"
 
 static void
-nv50_flush(struct pipe_context *pipe, unsigned flags)
+nv50_flush(struct pipe_context *pipe, unsigned flags,
+          struct pipe_fence_handle **fence)
 {
        struct nv50_context *nv50 = (struct nv50_context *)pipe;
-       struct nv50_screen *screen = nv50->screen;
-       struct nouveau_winsys *nvws = screen->nvws;
        
-       if (flags & PIPE_FLUSH_WAIT) {
-               nvws->notifier_reset(screen->sync, 0);
-               BEGIN_RING(tesla, 0x104, 1);
-               OUT_RING  (0);
-               BEGIN_RING(tesla, 0x100, 1);
-               OUT_RING  (0);
-       }
-
-       FIRE_RING();
-
-       if (flags & PIPE_FLUSH_WAIT)
-               nvws->notifier_wait(screen->sync, 0, 0, 2000);
+       FIRE_RING(fence);
 }
 
 static void
@@ -36,6 +24,12 @@ nv50_destroy(struct pipe_context *pipe)
        free(nv50);
 }
 
+
+static void
+nv50_set_edgeflags(struct pipe_context *pipe, const unsigned *bitfield)
+{
+}
+
 struct pipe_context *
 nv50_create(struct pipe_screen *pscreen, unsigned pctx_id)
 {
@@ -54,13 +48,13 @@ nv50_create(struct pipe_screen *pscreen, unsigned pctx_id)
 
        nv50->pipe.destroy = nv50_destroy;
 
+       nv50->pipe.set_edgeflags = nv50_set_edgeflags;
        nv50->pipe.draw_arrays = nv50_draw_arrays;
        nv50->pipe.draw_elements = nv50_draw_elements;
        nv50->pipe.clear = nv50_clear;
 
        nv50->pipe.flush = nv50_flush;
 
-       nv50_init_miptree_functions(nv50);
        nv50_init_surface_functions(nv50);
        nv50_init_state_functions(nv50);
        nv50_init_query_functions(nv50);