Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

[mesa.git] / src / gallium / drivers / nv40 / nv40_context.c

diff --git a/src/gallium/drivers/nv40/nv40_context.c b/src/gallium/drivers/nv40/nv40_context.c
index 58627443b80521334babca813cdb015bba75e11e..8eba6a43ef95338432b628380f57f15676c501cf 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_context.c
+++ b/src/gallium/drivers/nv40/nv40_context.c
@@ -1,16 +1,15 @@
 #include "draw/draw_context.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_winsys.h"
-#include "pipe/p_util.h"
+#include "pipe/internal/p_winsys_screen.h"
 
 #include "nv40_context.h"
 #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 +18,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
@@ -40,7 +28,30 @@ nv40_destroy(struct pipe_context *pipe)
 
        if (nv40->draw)
                draw_destroy(nv40->draw);
-       free(nv40);
+       FREE(nv40);
+}
+
+static unsigned int
+nv40_is_texture_referenced( struct pipe_context *pipe,
+                           struct pipe_texture *texture,
+                           unsigned face, unsigned level)
+{
+   /**
+    * FIXME: Optimize.
+    */
+
+   return PIPE_REFERENCED_FOR_READ | PIPE_REFERENCED_FOR_WRITE;
+}
+
+static unsigned int
+nv40_is_buffer_referenced( struct pipe_context *pipe,
+                          struct pipe_buffer *buf)
+{
+   /**
+    * FIXME: Optimize.
+    */
+
+   return PIPE_REFERENCED_FOR_READ | PIPE_REFERENCED_FOR_WRITE;
 }
 
 struct pipe_context *
@@ -49,7 +60,6 @@ nv40_create(struct pipe_screen *pscreen, unsigned pctx_id)
        struct nv40_screen *screen = nv40_screen(pscreen);
        struct pipe_winsys *ws = pscreen->winsys;
        struct nv40_context *nv40;
-       unsigned chipset = screen->chipset;
        struct nouveau_winsys *nvws = screen->nvws;
 
        nv40 = CALLOC(1, sizeof(struct nv40_context));
@@ -58,7 +68,6 @@ nv40_create(struct pipe_screen *pscreen, unsigned pctx_id)
        nv40->screen = screen;
        nv40->pctx_id = pctx_id;
 
-       nv40->chipset = chipset;
        nv40->nvws = nvws;
 
        nv40->pipe.winsys = ws;
@@ -69,10 +78,12 @@ nv40_create(struct pipe_screen *pscreen, unsigned pctx_id)
        nv40->pipe.clear = nv40_clear;
        nv40->pipe.flush = nv40_flush;
 
+       nv40->pipe.is_texture_referenced = nv40_is_texture_referenced;
+       nv40->pipe.is_buffer_referenced = nv40_is_buffer_referenced;
+
        nv40_init_query_functions(nv40);
        nv40_init_surface_functions(nv40);
        nv40_init_state_functions(nv40);
-       nv40_init_miptree_functions(nv40);
 
        /* Create, configure, and install fallback swtnl path */
        nv40->draw = draw_create();