Merge branch 'gallium-0.2' of git+ssh://marcheu@git.freedesktop.org/git/nouveau/mesa...

[mesa.git] / src / gallium / drivers / nv10 / nv10_context.c

diff --git a/src/gallium/drivers/nv10/nv10_context.c b/src/gallium/drivers/nv10/nv10_context.c
index a25c082a5d14b59ec78e7605260e5b3035360ba0..e9b61daae7f9ed0b4a8493bcb06c3cd1f2f04bcc 100644 (file)
--- a/src/gallium/drivers/nv10/nv10_context.c
+++ b/src/gallium/drivers/nv10/nv10_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 "nv10_context.h"
 #include "nv10_screen.h"
@@ -264,7 +263,6 @@ nv10_create(struct pipe_screen *pscreen, unsigned pctx_id)
        struct nv10_screen *screen = nv10_screen(pscreen);
        struct pipe_winsys *ws = pscreen->winsys;
        struct nv10_context *nv10;
-       unsigned chipset = screen->chipset;
        struct nouveau_winsys *nvws = screen->nvws;
 
        nv10 = CALLOC(1, sizeof(struct nv10_context));
@@ -273,7 +271,6 @@ nv10_create(struct pipe_screen *pscreen, unsigned pctx_id)
        nv10->screen = screen;
        nv10->pctx_id = pctx_id;
 
-       nv10->chipset = chipset;
        nv10->nvws = nvws;
 
        nv10->pipe.winsys = ws;
@@ -287,7 +284,6 @@ nv10_create(struct pipe_screen *pscreen, unsigned pctx_id)
 
        nv10_init_surface_functions(nv10);
        nv10_init_state_functions(nv10);
-       nv10_init_miptree_functions(nv10);
 
        nv10->draw = draw_create();
        assert(nv10->draw);