Squashed commit of the following:

[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 aa14e17872df2ff1b4df07b3ace7a3d7bf2ef059..f543b3c504d1b3949e5c354b9a0f508e3f0d575a 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_context.c
+++ b/src/gallium/drivers/nv50/nv50_context.c
@@ -25,6 +25,7 @@
 
 #include "nv50_context.h"
 #include "nv50_screen.h"
+#include "nv50_resource.h"
 
 static void
 nv50_flush(struct pipe_context *pipe, unsigned flags,
@@ -89,15 +90,12 @@ nv50_create(struct pipe_screen *pscreen, void *priv)
 
        nv50->pipe.flush = nv50_flush;
 
-       nv50->pipe.is_texture_referenced = nouveau_is_texture_referenced;
-       nv50->pipe.is_buffer_referenced = nouveau_is_buffer_referenced;
-
        screen->base.channel->user_private = nv50;
 
        nv50_init_surface_functions(nv50);
        nv50_init_state_functions(nv50);
        nv50_init_query_functions(nv50);
-        nv50_init_transfer_functions(nv50);
+       nv50_init_resource_functions(&nv50->pipe);
 
        nv50->draw = draw_create();
        assert(nv50->draw);