Merge branch 'master' into glsl-pp-rework-2

[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 d9d9accea8d61d77a91fd6ca22c07aa3c6b5101a..7f008274a4e301d5621234853afbfb036e51bb3e 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_context.c
+++ b/src/gallium/drivers/nv40/nv40_context.c
@@ -1,7 +1,6 @@
 #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"
@@ -11,7 +10,7 @@ nv40_flush(struct pipe_context *pipe, unsigned flags,
           struct pipe_fence_handle **fence)
 {
        struct nv40_context *nv40 = nv40_context(pipe);
-       
+
        if (flags & PIPE_FLUSH_TEXTURE_CACHE) {
                BEGIN_RING(curie, 0x1fd8, 1);
                OUT_RING  (2);
@@ -56,10 +55,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 = nouveau_is_texture_referenced;
+       nv40->pipe.is_buffer_referenced = nouveau_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();
@@ -71,4 +72,3 @@ nv40_create(struct pipe_screen *pscreen, unsigned pctx_id)
 
        return &nv40->pipe;
 }
-