nouveau: gallium directory structure changed again..

71 files changed, 58 insertions, 78 deletions

diff --git a/src/gallium/drivers/nouveau/nouveau_stateobj.h b/src/gallium/drivers/nouveau/nouveau_stateobj.h
index 998ec2d4ad..729988b095 100644
--- a/src/gallium/drivers/nouveau/nouveau_stateobj.h
+++ b/src/gallium/drivers/nouveau/nouveau_stateobj.h
@@ -1,7 +1,6 @@
 #ifndef __NOUVEAU_STATEOBJ_H__
 #define __NOUVEAU_STATEOBJ_H__
 
-#include "pipe/p_util.h"
 #include "pipe/p_debug.h"
 
 struct nouveau_stateobj_reloc {
diff --git a/src/gallium/drivers/nv04/nv04_context.c b/src/gallium/drivers/nv04/nv04_context.c
index 852a8edf5f..9f75253363 100644
--- a/src/gallium/drivers/nv04/nv04_context.c
+++ b/src/gallium/drivers/nv04/nv04_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 "nv04_context.h"
 #include "nv04_screen.h"
diff --git a/src/gallium/drivers/nv04/nv04_context.h b/src/gallium/drivers/nv04/nv04_context.h
index 5ba1d4ecdc..3e6a085270 100644
--- a/src/gallium/drivers/nv04/nv04_context.h
+++ b/src/gallium/drivers/nv04/nv04_context.h
@@ -4,6 +4,10 @@
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
+#include "pipe/p_compiler.h"
+
+#include "util/u_memory.h"
+#include "util/u_math.h"
 
 #include "draw/draw_vertex.h"
 
diff --git a/src/gallium/drivers/nv04/nv04_fragprog.c b/src/gallium/drivers/nv04/nv04_fragprog.c
index 215974eec0..8a2af41fe0 100644
--- a/src/gallium/drivers/nv04/nv04_fragprog.c
+++ b/src/gallium/drivers/nv04/nv04_fragprog.c
@@ -1,7 +1,6 @@
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
-#include "pipe/p_util.h"
 
 #include "pipe/p_shader_tokens.h"
 #include "tgsi/tgsi_parse.h"
diff --git a/src/gallium/drivers/nv04/nv04_miptree.c b/src/gallium/drivers/nv04/nv04_miptree.c
index 97f679731e..02f7d210e3 100644
--- a/src/gallium/drivers/nv04/nv04_miptree.c
+++ b/src/gallium/drivers/nv04/nv04_miptree.c
@@ -1,6 +1,5 @@
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_util.h"
 #include "pipe/p_inlines.h"
 
 #include "nv04_context.h"
@@ -72,7 +71,6 @@ nv04_miptree_create(struct pipe_screen *screen, const struct pipe_texture *pt)
 static void
 nv04_miptree_release(struct pipe_screen *screen, struct pipe_texture **pt)
 {
-	struct pipe_winsys *ws = screen->winsys;
 	struct pipe_texture *mt = *pt;
 
 	*pt = NULL;
@@ -80,7 +78,7 @@ nv04_miptree_release(struct pipe_screen *screen, struct pipe_texture **pt)
 		struct nv04_miptree *nv04mt = (struct nv04_miptree *)mt;
 		int l;
 
-		pipe_buffer_reference(ws, &nv04mt->buffer, NULL);
+		pipe_buffer_reference(screen, &nv04mt->buffer, NULL);
 		for (l = 0; l <= mt->last_level; l++) {
 			if (nv04mt->level[l].image_offset)
 				FREE(nv04mt->level[l].image_offset);
@@ -101,7 +99,7 @@ nv04_miptree_surface_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
 	ps = ws->surface_alloc(ws);
 	if (!ps)
 		return NULL;
-	pipe_buffer_reference(ws, &ps->buffer, nv04mt->buffer);
+	pipe_buffer_reference(pscreen, &ps->buffer, nv04mt->buffer);
 	ps->format = pt->format;
 		ps->width = pt->width[level];
 	ps->height = pt->height[level];
diff --git a/src/gallium/drivers/nv04/nv04_prim_vbuf.c b/src/gallium/drivers/nv04/nv04_prim_vbuf.c
index d3963d1f59..19979fff79 100644
--- a/src/gallium/drivers/nv04/nv04_prim_vbuf.c
+++ b/src/gallium/drivers/nv04/nv04_prim_vbuf.c
@@ -1,9 +1,10 @@
 
-#include "draw/draw_vbuf.h"
 #include "pipe/p_debug.h"
-#include "pipe/p_util.h"
 #include "pipe/p_inlines.h"
 #include "pipe/p_winsys.h"
+#include "pipe/p_compiler.h"
+
+#include "draw/draw_vbuf.h"
 
 #include "nv04_context.h"
 #include "nv04_state.h"
diff --git a/src/gallium/drivers/nv04/nv04_screen.c b/src/gallium/drivers/nv04/nv04_screen.c
index da09a3a5fe..3966a29ffa 100644
--- a/src/gallium/drivers/nv04/nv04_screen.c
+++ b/src/gallium/drivers/nv04/nv04_screen.c
@@ -1,5 +1,4 @@
 #include "pipe/p_screen.h"
-#include "pipe/p_util.h"
 
 #include "nv04_context.h"
 #include "nv04_screen.h"
diff --git a/src/gallium/drivers/nv04/nv04_state.c b/src/gallium/drivers/nv04/nv04_state.c
index 668d875671..ff1933b550 100644
--- a/src/gallium/drivers/nv04/nv04_state.c
+++ b/src/gallium/drivers/nv04/nv04_state.c
@@ -1,7 +1,6 @@
 #include "draw/draw_context.h"
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_util.h"
 #include "pipe/p_shader_tokens.h"
 
 #include "tgsi/tgsi_parse.h"
diff --git a/src/gallium/drivers/nv04/nv04_surface.c b/src/gallium/drivers/nv04/nv04_surface.c
index b13ebf9f9b..57039483c6 100644
--- a/src/gallium/drivers/nv04/nv04_surface.c
+++ b/src/gallium/drivers/nv04/nv04_surface.c
@@ -28,10 +28,9 @@
 
 #include "nv04_context.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_util.h"
 #include "pipe/p_winsys.h"
 #include "pipe/p_inlines.h"
-#include "util/p_tile.h"
+#include "util/u_tile.h"
 
 static void
 nv04_surface_copy(struct pipe_context *pipe, unsigned do_flip,
diff --git a/src/gallium/drivers/nv04/nv04_vbo.c b/src/gallium/drivers/nv04/nv04_vbo.c
index fbfe0cf406..91f919d48e 100644
--- a/src/gallium/drivers/nv04/nv04_vbo.c
+++ b/src/gallium/drivers/nv04/nv04_vbo.c
@@ -1,7 +1,6 @@
 #include "draw/draw_context.h"
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
-#include "pipe/p_util.h"
 
 #include "nv04_context.h"
 #include "nv04_state.h"
diff --git a/src/gallium/drivers/nv10/nv10_context.c b/src/gallium/drivers/nv10/nv10_context.c
index 9fcd0b0fc3..e9b61daae7 100644
--- 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"
diff --git a/src/gallium/drivers/nv10/nv10_context.h b/src/gallium/drivers/nv10/nv10_context.h
index 2bdba53db8..f3b56de25a 100644
--- a/src/gallium/drivers/nv10/nv10_context.h
+++ b/src/gallium/drivers/nv10/nv10_context.h
@@ -4,6 +4,10 @@
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
+#include "pipe/p_compiler.h"
+
+#include "util/u_memory.h"
+#include "util/u_math.h"
 
 #include "draw/draw_vertex.h"
 
diff --git a/src/gallium/drivers/nv10/nv10_fragprog.c b/src/gallium/drivers/nv10/nv10_fragprog.c
index 137de9d53e..698db5a16a 100644
--- a/src/gallium/drivers/nv10/nv10_fragprog.c
+++ b/src/gallium/drivers/nv10/nv10_fragprog.c
@@ -1,7 +1,6 @@
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
-#include "pipe/p_util.h"
 
 #include "pipe/p_shader_tokens.h"
 #include "tgsi/tgsi_parse.h"
diff --git a/src/gallium/drivers/nv10/nv10_miptree.c b/src/gallium/drivers/nv10/nv10_miptree.c
index 9a68df2925..ad084e72b8 100644
--- a/src/gallium/drivers/nv10/nv10_miptree.c
+++ b/src/gallium/drivers/nv10/nv10_miptree.c
@@ -1,6 +1,5 @@
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_util.h"
 #include "pipe/p_inlines.h"
 
 #include "nv10_context.h"
@@ -79,7 +78,6 @@ nv10_miptree_create(struct pipe_screen *screen, const struct pipe_texture *pt)
 static void
 nv10_miptree_release(struct pipe_screen *screen, struct pipe_texture **pt)
 {
-	struct pipe_winsys *ws = screen->winsys;
 	struct pipe_texture *mt = *pt;
 
 	*pt = NULL;
@@ -87,7 +85,7 @@ nv10_miptree_release(struct pipe_screen *screen, struct pipe_texture **pt)
 		struct nv10_miptree *nv10mt = (struct nv10_miptree *)mt;
 		int l;
 
-		pipe_buffer_reference(ws, &nv10mt->buffer, NULL);
+		pipe_buffer_reference(screen, &nv10mt->buffer, NULL);
 		for (l = 0; l <= mt->last_level; l++) {
 			if (nv10mt->level[l].image_offset)
 				FREE(nv10mt->level[l].image_offset);
@@ -115,7 +113,7 @@ nv10_miptree_surface_get(struct pipe_screen *screen, struct pipe_texture *pt,
 	ps = ws->surface_alloc(ws);
 	if (!ps)
 		return NULL;
-	pipe_buffer_reference(ws, &ps->buffer, nv10mt->buffer);
+	pipe_buffer_reference(screen, &ps->buffer, nv10mt->buffer);
 	ps->format = pt->format;
 	ps->width = pt->width[level];
 	ps->height = pt->height[level];
diff --git a/src/gallium/drivers/nv10/nv10_prim_vbuf.c b/src/gallium/drivers/nv10/nv10_prim_vbuf.c
index 930536b946..62a8f6d89d 100644
--- a/src/gallium/drivers/nv10/nv10_prim_vbuf.c
+++ b/src/gallium/drivers/nv10/nv10_prim_vbuf.c
@@ -38,15 +38,14 @@
  */
 
 
-#include "draw/draw_vbuf.h"
 #include "pipe/p_debug.h"
-#include "pipe/p_util.h"
 #include "pipe/p_inlines.h"
 #include "pipe/p_winsys.h"
 
 #include "nv10_context.h"
 #include "nv10_state.h"
 
+#include "draw/draw_vbuf.h"
 
 /**
  * Primitive renderer for nv10.
@@ -180,10 +179,11 @@ nv10_vbuf_render_release_vertices( struct vbuf_render *render,
 	struct nv10_vbuf_render *nv10_render = nv10_vbuf_render(render);
 	struct nv10_context *nv10 = nv10_render->nv10;
 	struct pipe_winsys *winsys = nv10->pipe.winsys;
+	struct pipe_screen *pscreen = &nv10->screen->pipe;
 
 	assert(nv10_render->buffer);
 	winsys->buffer_unmap(winsys, nv10_render->buffer);
-	pipe_buffer_reference(winsys, &nv10_render->buffer, NULL);
+	pipe_buffer_reference(pscreen, &nv10_render->buffer, NULL);
 }
 
 
diff --git a/src/gallium/drivers/nv10/nv10_screen.c b/src/gallium/drivers/nv10/nv10_screen.c
index 403f7b98cd..27a9edf9bb 100644
--- a/src/gallium/drivers/nv10/nv10_screen.c
+++ b/src/gallium/drivers/nv10/nv10_screen.c
@@ -1,5 +1,4 @@
 #include "pipe/p_screen.h"
-#include "pipe/p_util.h"
 
 #include "nv10_context.h"
 #include "nv10_screen.h"
diff --git a/src/gallium/drivers/nv10/nv10_state.c b/src/gallium/drivers/nv10/nv10_state.c
index f902fd54b6..d2375aa2f6 100644
--- a/src/gallium/drivers/nv10/nv10_state.c
+++ b/src/gallium/drivers/nv10/nv10_state.c
@@ -1,7 +1,6 @@
 #include "draw/draw_context.h"
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_util.h"
 #include "pipe/p_shader_tokens.h"
 
 #include "tgsi/tgsi_parse.h"
diff --git a/src/gallium/drivers/nv10/nv10_state_emit.c b/src/gallium/drivers/nv10/nv10_state_emit.c
index d21368d33f..46c7e1d753 100644
--- a/src/gallium/drivers/nv10/nv10_state_emit.c
+++ b/src/gallium/drivers/nv10/nv10_state_emit.c
@@ -1,5 +1,3 @@
-#include "pipe/p_util.h"
-
 #include "nv10_context.h"
 #include "nv10_state.h"
 
diff --git a/src/gallium/drivers/nv10/nv10_surface.c b/src/gallium/drivers/nv10/nv10_surface.c
index 2e230ebbec..875e4c5858 100644
--- a/src/gallium/drivers/nv10/nv10_surface.c
+++ b/src/gallium/drivers/nv10/nv10_surface.c
@@ -28,10 +28,9 @@
 
 #include "nv10_context.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_util.h"
 #include "pipe/p_winsys.h"
 #include "pipe/p_inlines.h"
-#include "util/p_tile.h"
+#include "util/u_tile.h"
 
 static void
 nv10_surface_copy(struct pipe_context *pipe, unsigned do_flip,
diff --git a/src/gallium/drivers/nv10/nv10_vbo.c b/src/gallium/drivers/nv10/nv10_vbo.c
index f024f53420..d0e788ac03 100644
--- a/src/gallium/drivers/nv10/nv10_vbo.c
+++ b/src/gallium/drivers/nv10/nv10_vbo.c
@@ -1,7 +1,6 @@
 #include "draw/draw_context.h"
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
-#include "pipe/p_util.h"
 
 #include "nv10_context.h"
 #include "nv10_state.h"
diff --git a/src/gallium/drivers/nv30/nv30_context.c b/src/gallium/drivers/nv30/nv30_context.c
index eefc614e5b..2bff28aca9 100644
--- a/src/gallium/drivers/nv30/nv30_context.c
+++ b/src/gallium/drivers/nv30/nv30_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 "nv30_context.h"
 #include "nv30_screen.h"
diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index 823b34a7c3..b933769700 100644
--- a/src/gallium/drivers/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -4,6 +4,10 @@
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
+#include "pipe/p_compiler.h"
+
+#include "util/u_memory.h"
+#include "util/u_math.h"
 
 #include "draw/draw_vertex.h"
 
diff --git a/src/gallium/drivers/nv30/nv30_draw.c b/src/gallium/drivers/nv30/nv30_draw.c
index aeeaf58f20..74fc138c05 100644
--- a/src/gallium/drivers/nv30/nv30_draw.c
+++ b/src/gallium/drivers/nv30/nv30_draw.c
@@ -1,5 +1,4 @@
 #include "draw/draw_pipe.h"
-#include "pipe/p_util.h"
 
 #include "nv30_context.h"
 
diff --git a/src/gallium/drivers/nv30/nv30_miptree.c b/src/gallium/drivers/nv30/nv30_miptree.c
index a0e488c09b..5c4f4da948 100644
--- a/src/gallium/drivers/nv30/nv30_miptree.c
+++ b/src/gallium/drivers/nv30/nv30_miptree.c
@@ -1,6 +1,5 @@
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_util.h"
 #include "pipe/p_inlines.h"
 
 #include "nv30_context.h"
@@ -33,7 +32,7 @@ nv30_miptree_layout(struct nv30_miptree *nv30mt)
 
 		if (swizzled)
 			pitch = pt->nblocksx[l];
-		pitch = align_int(pitch, 64);
+		pitch = align(pitch, 64);
 
 		nv30mt->level[l].pitch = pitch * pt->block.size;
 		nv30mt->level[l].image_offset =
@@ -84,7 +83,6 @@ nv30_miptree_create(struct pipe_screen *pscreen, const struct pipe_texture *pt)
 static void
 nv30_miptree_release(struct pipe_screen *pscreen, struct pipe_texture **pt)
 {
-	struct pipe_winsys *ws = pscreen->winsys;
 	struct pipe_texture *mt = *pt;
 
 	*pt = NULL;
@@ -92,7 +90,7 @@ nv30_miptree_release(struct pipe_screen *pscreen, struct pipe_texture **pt)
 		struct nv30_miptree *nv30mt = (struct nv30_miptree *)mt;
 		int l;
 
-		pipe_buffer_reference(ws, &nv30mt->buffer, NULL);
+		pipe_buffer_reference(pscreen, &nv30mt->buffer, NULL);
 		for (l = 0; l <= mt->last_level; l++) {
 			if (nv30mt->level[l].image_offset)
 				FREE(nv30mt->level[l].image_offset);
@@ -106,7 +104,6 @@ nv30_miptree_surface_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
 			 unsigned face, unsigned level, unsigned zslice,
 			 unsigned flags)
 {
-	struct pipe_winsys *ws = pscreen->winsys;
 	struct nv30_miptree *nv30mt = (struct nv30_miptree *)pt;
 	struct pipe_surface *ps;
 
@@ -114,7 +111,7 @@ nv30_miptree_surface_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
 	if (!ps)
 		return NULL;
 	pipe_texture_reference(&ps->texture, pt);
-	pipe_buffer_reference(ws, &ps->buffer, nv30mt->buffer);
+	pipe_buffer_reference(pscreen, &ps->buffer, nv30mt->buffer);
 	ps->format = pt->format;
 	ps->width = pt->width[level];
 	ps->height = pt->height[level];
diff --git a/src/gallium/drivers/nv30/nv30_screen.c b/src/gallium/drivers/nv30/nv30_screen.c
index d5514c2aba..a595e2eb22 100644
--- a/src/gallium/drivers/nv30/nv30_screen.c
+++ b/src/gallium/drivers/nv30/nv30_screen.c
@@ -1,5 +1,4 @@
 #include "pipe/p_screen.h"
-#include "pipe/p_util.h"
 
 #include "nv30_context.h"
 #include "nv30_screen.h"
diff --git a/src/gallium/drivers/nv30/nv30_state.c b/src/gallium/drivers/nv30/nv30_state.c
index eceb535315..fc66075c83 100644
--- a/src/gallium/drivers/nv30/nv30_state.c
+++ b/src/gallium/drivers/nv30/nv30_state.c
@@ -1,6 +1,5 @@
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_util.h"
 #include "pipe/p_inlines.h"
 
 #include "tgsi/tgsi_parse.h"
diff --git a/src/gallium/drivers/nv30/nv30_surface.c b/src/gallium/drivers/nv30/nv30_surface.c
index b22211ac86..36f4887750 100644
--- a/src/gallium/drivers/nv30/nv30_surface.c
+++ b/src/gallium/drivers/nv30/nv30_surface.c
@@ -28,10 +28,10 @@
 
 #include "nv30_context.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_util.h"
 #include "pipe/p_winsys.h"
 #include "pipe/p_inlines.h"
-#include "util/p_tile.h"
+
+#include "util/u_tile.h"
 
 static void
 nv30_surface_copy(struct pipe_context *pipe, unsigned do_flip,
diff --git a/src/gallium/drivers/nv30/nv30_vbo.c b/src/gallium/drivers/nv30/nv30_vbo.c
index b1c73793bf..556f981d4a 100644
--- a/src/gallium/drivers/nv30/nv30_vbo.c
+++ b/src/gallium/drivers/nv30/nv30_vbo.c
@@ -1,6 +1,5 @@
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
-#include "pipe/p_util.h"
 
 #include "nv30_context.h"
 #include "nv30_state.h"
diff --git a/src/gallium/drivers/nv40/nv40_context.c b/src/gallium/drivers/nv40/nv40_context.c
index a40f14895f..cc63dd734b 100644
--- 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 "nv40_context.h"
 #include "nv40_screen.h"
diff --git a/src/gallium/drivers/nv40/nv40_context.h b/src/gallium/drivers/nv40/nv40_context.h
index 8e60a81e68..adcfbdd85a 100644
--- a/src/gallium/drivers/nv40/nv40_context.h
+++ b/src/gallium/drivers/nv40/nv40_context.h
@@ -4,6 +4,10 @@
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
+#include "pipe/p_compiler.h"
+
+#include "util/u_memory.h"
+#include "util/u_math.h"
 
 #include "draw/draw_vertex.h"
 
diff --git a/src/gallium/drivers/nv40/nv40_draw.c b/src/gallium/drivers/nv40/nv40_draw.c
index 2cf58e2950..8e56cdc2fe 100644
--- a/src/gallium/drivers/nv40/nv40_draw.c
+++ b/src/gallium/drivers/nv40/nv40_draw.c
@@ -1,6 +1,7 @@
-#include "pipe/p_util.h"
 #include "pipe/p_shader_tokens.h"
 
+#include "util/u_pack_color.h"
+
 #include "draw/draw_context.h"
 #include "draw/draw_vertex.h"
 #include "draw/draw_pipe.h"
diff --git a/src/gallium/drivers/nv40/nv40_miptree.c b/src/gallium/drivers/nv40/nv40_miptree.c
index 38e1a5f04c..6c54c37ef7 100644
--- a/src/gallium/drivers/nv40/nv40_miptree.c
+++ b/src/gallium/drivers/nv40/nv40_miptree.c
@@ -1,6 +1,5 @@
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_util.h"
 #include "pipe/p_inlines.h"
 
 #include "nv40_context.h"
@@ -33,7 +32,7 @@ nv40_miptree_layout(struct nv40_miptree *nv40mt)
 
 		if (swizzled)
 			pitch = pt->nblocksx[l];
-		pitch = align_int(pitch, 64);
+		pitch = align(pitch, 64);
 
 		nv40mt->level[l].pitch = pitch * pt->block.size;
 		nv40mt->level[l].image_offset =
@@ -84,7 +83,6 @@ nv40_miptree_create(struct pipe_screen *pscreen, const struct pipe_texture *pt)
 static void
 nv40_miptree_release(struct pipe_screen *pscreen, struct pipe_texture **pt)
 {
-	struct pipe_winsys *ws = pscreen->winsys;
 	struct pipe_texture *mt = *pt;
 
 	*pt = NULL;
@@ -92,7 +90,7 @@ nv40_miptree_release(struct pipe_screen *pscreen, struct pipe_texture **pt)
 		struct nv40_miptree *nv40mt = (struct nv40_miptree *)mt;
 		int l;
 
-		pipe_buffer_reference(ws, &nv40mt->buffer, NULL);
+		pipe_buffer_reference(pscreen, &nv40mt->buffer, NULL);
 		for (l = 0; l <= mt->last_level; l++) {
 			if (nv40mt->level[l].image_offset)
 				FREE(nv40mt->level[l].image_offset);
@@ -106,7 +104,6 @@ nv40_miptree_surface_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
 			 unsigned face, unsigned level, unsigned zslice,
 			 unsigned flags)
 {
-	struct pipe_winsys *ws = pscreen->winsys;
 	struct nv40_miptree *nv40mt = (struct nv40_miptree *)pt;
 	struct pipe_surface *ps;
 
@@ -114,7 +111,7 @@ nv40_miptree_surface_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
 	if (!ps)
 		return NULL;
 	pipe_texture_reference(&ps->texture, pt);
-	pipe_buffer_reference(ws, &ps->buffer, nv40mt->buffer);
+	pipe_buffer_reference(pscreen, &ps->buffer, nv40mt->buffer);
 	ps->format = pt->format;
 	ps->width = pt->width[level];
 	ps->height = pt->height[level];
@@ -148,7 +145,7 @@ nv40_miptree_surface_del(struct pipe_screen *pscreen,
 		return;
 
 	pipe_texture_reference(&ps->texture, NULL);
-	pipe_buffer_reference(pscreen->winsys, &ps->buffer, NULL);
+	pipe_buffer_reference(pscreen, &ps->buffer, NULL);
 	FREE(ps);
 }
 
diff --git a/src/gallium/drivers/nv40/nv40_screen.c b/src/gallium/drivers/nv40/nv40_screen.c
index 0e1df89ee8..ada0238511 100644
--- a/src/gallium/drivers/nv40/nv40_screen.c
+++ b/src/gallium/drivers/nv40/nv40_screen.c
@@ -1,5 +1,4 @@
 #include "pipe/p_screen.h"
-#include "pipe/p_util.h"
 
 #include "nv40_context.h"
 #include "nv40_screen.h"
diff --git a/src/gallium/drivers/nv40/nv40_state.c b/src/gallium/drivers/nv40/nv40_state.c
index 63d0ecc915..255c4b294d 100644
--- a/src/gallium/drivers/nv40/nv40_state.c
+++ b/src/gallium/drivers/nv40/nv40_state.c
@@ -1,6 +1,5 @@
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_util.h"
 #include "pipe/p_inlines.h"
 
 #include "draw/draw_context.h"
diff --git a/src/gallium/drivers/nv40/nv40_surface.c b/src/gallium/drivers/nv40/nv40_surface.c
index 0916555d56..576af7c59e 100644
--- a/src/gallium/drivers/nv40/nv40_surface.c
+++ b/src/gallium/drivers/nv40/nv40_surface.c
@@ -28,10 +28,10 @@
 
 #include "nv40_context.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_util.h"
 #include "pipe/p_winsys.h"
 #include "pipe/p_inlines.h"
-#include "util/p_tile.h"
+
+#include "util/u_tile.h"
 
 static void
 nv40_surface_copy(struct pipe_context *pipe, boolean do_flip,
diff --git a/src/gallium/drivers/nv40/nv40_vbo.c b/src/gallium/drivers/nv40/nv40_vbo.c
index 755d5586b7..09f6e79d32 100644
--- a/src/gallium/drivers/nv40/nv40_vbo.c
+++ b/src/gallium/drivers/nv40/nv40_vbo.c
@@ -1,6 +1,5 @@
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
-#include "pipe/p_util.h"
 
 #include "nv40_context.h"
 #include "nv40_state.h"
diff --git a/src/gallium/drivers/nv50/nv50_context.c b/src/gallium/drivers/nv50/nv50_context.c
index 07987c7d02..b02c53f209 100644
--- a/src/gallium/drivers/nv50/nv50_context.c
+++ b/src/gallium/drivers/nv50/nv50_context.c
@@ -23,7 +23,6 @@
 #include "draw/draw_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_winsys.h"
-#include "pipe/p_util.h"
 
 #include "nv50_context.h"
 #include "nv50_screen.h"
diff --git a/src/gallium/drivers/nv50/nv50_context.h b/src/gallium/drivers/nv50/nv50_context.h
index 1c069f1625..5d377f2d06 100644
--- a/src/gallium/drivers/nv50/nv50_context.h
+++ b/src/gallium/drivers/nv50/nv50_context.h
@@ -4,6 +4,10 @@
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
+#include "pipe/p_compiler.h"
+
+#include "util/u_memory.h"
+#include "util/u_math.h"
 
 #include "draw/draw_vertex.h"
 
diff --git a/src/gallium/drivers/nv50/nv50_draw.c b/src/gallium/drivers/nv50/nv50_draw.c
index 4fd81bd27a..2f6f607261 100644
--- a/src/gallium/drivers/nv50/nv50_draw.c
+++ b/src/gallium/drivers/nv50/nv50_draw.c
@@ -21,7 +21,6 @@
  */
 
 #include "draw/draw_pipe.h"
-#include "pipe/p_util.h"
 
 #include "nv50_context.h"
 
diff --git a/src/gallium/drivers/nv50/nv50_miptree.c b/src/gallium/drivers/nv50/nv50_miptree.c
index a02ad41885..b0e8fe2f0b 100644
--- a/src/gallium/drivers/nv50/nv50_miptree.c
+++ b/src/gallium/drivers/nv50/nv50_miptree.c
@@ -22,7 +22,6 @@
 
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_util.h"
 #include "pipe/p_inlines.h"
 
 #include "nv50_context.h"
@@ -62,7 +61,6 @@ nv50_miptree_create(struct pipe_screen *pscreen, const struct pipe_texture *pt)
 static void
 nv50_miptree_release(struct pipe_screen *pscreen, struct pipe_texture **ppt)
 {
-	struct pipe_winsys *ws = pscreen->winsys;
 	struct pipe_texture *pt = *ppt;
 
 	*ppt = NULL;
@@ -70,7 +68,7 @@ nv50_miptree_release(struct pipe_screen *pscreen, struct pipe_texture **ppt)
 	if (--pt->refcount <= 0) {
 		struct nv50_miptree *mt = nv50_miptree(pt);
 
-		pipe_buffer_reference(ws, &mt->buffer, NULL);
+		pipe_buffer_reference(pscreen, &mt->buffer, NULL);
 		FREE(mt);
 	}
 }
@@ -80,7 +78,6 @@ nv50_miptree_surface_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
 			 unsigned face, unsigned level, unsigned zslice,
 			 unsigned flags)
 {
-	struct pipe_winsys *ws = pscreen->winsys;
 	struct nv50_miptree *mt = nv50_miptree(pt);
 	struct nv50_surface *s;
 	struct pipe_surface *ps;
@@ -91,7 +88,7 @@ nv50_miptree_surface_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
 	ps = &s->base;
 
 	ps->refcount = 1;
-	ps->winsys = ws;
+	ps->winsys = pscreen->winsys;
 	ps->format = pt->format;
 	ps->width = pt->width[level];
 	ps->height = pt->height[level];
@@ -104,7 +101,7 @@ nv50_miptree_surface_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
 	ps->status = PIPE_SURFACE_STATUS_DEFINED;
 
 	pipe_texture_reference(&ps->texture, pt);
-	pipe_buffer_reference(ws, &ps->buffer, mt->buffer);
+	pipe_buffer_reference(pscreen, &ps->buffer, mt->buffer);
 
 	return ps;
 }
@@ -113,7 +110,6 @@ static void
 nv50_miptree_surface_del(struct pipe_screen *pscreen,
 			 struct pipe_surface **psurface)
 {
-	struct pipe_winsys *ws = pscreen->winsys;
 	struct pipe_surface *ps = *psurface;
 	struct nv50_surface *s = nv50_surface(ps);
 
@@ -121,7 +117,7 @@ nv50_miptree_surface_del(struct pipe_screen *pscreen,
 
 	if (--ps->refcount <= 0) {
 		pipe_texture_reference(&ps->texture, NULL);
-		pipe_buffer_reference(ws, &ps->buffer, NULL);
+		pipe_buffer_reference(pscreen, &ps->buffer, NULL);
 		FREE(s);
 	}
 }
diff --git a/src/gallium/drivers/nv50/nv50_screen.c b/src/gallium/drivers/nv50/nv50_screen.c
index ec43923929..b5aef7dadd 100644
--- a/src/gallium/drivers/nv50/nv50_screen.c
+++ b/src/gallium/drivers/nv50/nv50_screen.c
@@ -21,7 +21,6 @@
  */
 
 #include "pipe/p_screen.h"
-#include "pipe/p_util.h"
 
 #include "nv50_context.h"
 #include "nv50_screen.h"
diff --git a/src/gallium/drivers/nv50/nv50_state.c b/src/gallium/drivers/nv50/nv50_state.c
index 4055527d9f..95f9d408b5 100644
--- a/src/gallium/drivers/nv50/nv50_state.c
+++ b/src/gallium/drivers/nv50/nv50_state.c
@@ -22,7 +22,6 @@
 
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_util.h"
 #include "pipe/p_inlines.h"
 
 #include "tgsi/tgsi_parse.h"
diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c
index a9daeee369..5bf97d3a6b 100644
--- a/src/gallium/drivers/nv50/nv50_surface.c
+++ b/src/gallium/drivers/nv50/nv50_surface.c
@@ -22,10 +22,10 @@
 
 #include "nv50_context.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_util.h"
 #include "pipe/p_winsys.h"
 #include "pipe/p_inlines.h"
-#include "util/p_tile.h"
+
+#include "util/u_tile.h"
 
 static void
 nv50_surface_copy(struct pipe_context *pipe, boolean flip,
@@ -90,10 +90,10 @@ nv50_surface_map(struct pipe_screen *screen, struct pipe_surface *ps,
 }
 
 static void
-nv50_surface_unmap(struct pipe_screen *screen, struct pipe_surface *ps)
+nv50_surface_unmap(struct pipe_screen *pscreen, struct pipe_surface *ps)
 {
-	struct nouveau_winsys *nvws = nv50_screen(screen)->nvws;
-	struct pipe_winsys *ws = screen->winsys;
+	struct nouveau_winsys *nvws = nv50_screen(pscreen)->nvws;
+	struct pipe_winsys *ws = pscreen->winsys;
 	struct nv50_surface *s = nv50_surface(ps);
 	struct nv50_surface m = *s;
 
@@ -104,7 +104,7 @@ nv50_surface_unmap(struct pipe_screen *screen, struct pipe_surface *ps)
 	nvws->surface_copy(nvws, &s->base, 0, 0, &m.base, 0, 0,
 				 ps->width, ps->height);
 
-	pipe_buffer_reference(ws, &s->untiled, NULL);
+	pipe_buffer_reference(pscreen, &s->untiled, NULL);
 }
 
 void
diff --git a/src/gallium/drivers/nv50/nv50_vbo.c b/src/gallium/drivers/nv50/nv50_vbo.c
index c94531723b..584336682e 100644
--- a/src/gallium/drivers/nv50/nv50_vbo.c
+++ b/src/gallium/drivers/nv50/nv50_vbo.c
@@ -22,7 +22,6 @@
 
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
-#include "pipe/p_util.h"
 
 #include "nv50_context.h"
 
diff --git a/src/gallium/winsys/dri/nouveau/Makefile b/src/gallium/winsys/drm/nouveau/Makefile
index be630ff6d1..be630ff6d1 100644
--- a/src/gallium/winsys/dri/nouveau/Makefile
+++ b/src/gallium/winsys/drm/nouveau/Makefile
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_bo.c b/src/gallium/winsys/drm/nouveau/nouveau_bo.c
index b5942994d9..b5942994d9 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_bo.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_bo.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_channel.c b/src/gallium/winsys/drm/nouveau/nouveau_channel.c
index 3b4dcd1ecf..3b4dcd1ecf 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_channel.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_channel.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_context.c b/src/gallium/winsys/drm/nouveau/nouveau_context.c
index 74413c408f..74413c408f 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_context.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_context.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_context.h b/src/gallium/winsys/drm/nouveau/nouveau_context.h
index 77e2147a2c..77e2147a2c 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_context.h
+++ b/src/gallium/winsys/drm/nouveau/nouveau_context.h
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_device.c b/src/gallium/winsys/drm/nouveau/nouveau_device.c
index 0b452fcd02..0b452fcd02 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_device.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_device.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_dma.c b/src/gallium/winsys/drm/nouveau/nouveau_dma.c
index f8a8ba04f6..f8a8ba04f6 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_dma.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_dma.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_dma.h b/src/gallium/winsys/drm/nouveau/nouveau_dma.h
index cfa6d26e82..cfa6d26e82 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_dma.h
+++ b/src/gallium/winsys/drm/nouveau/nouveau_dma.h
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_dri.h b/src/gallium/winsys/drm/nouveau/nouveau_dri.h
index 1207c2d609..1207c2d609 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_dri.h
+++ b/src/gallium/winsys/drm/nouveau/nouveau_dri.h
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_drmif.h b/src/gallium/winsys/drm/nouveau/nouveau_drmif.h
index dcd6a5eb0a..dcd6a5eb0a 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_drmif.h
+++ b/src/gallium/winsys/drm/nouveau/nouveau_drmif.h
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_fence.c b/src/gallium/winsys/drm/nouveau/nouveau_fence.c
index e7b0b4ff07..e7b0b4ff07 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_fence.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_fence.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_grobj.c b/src/gallium/winsys/drm/nouveau/nouveau_grobj.c
index 51523897d5..51523897d5 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_grobj.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_grobj.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_local.h b/src/gallium/winsys/drm/nouveau/nouveau_local.h
index e878a40803..e878a40803 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_local.h
+++ b/src/gallium/winsys/drm/nouveau/nouveau_local.h
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_lock.c b/src/gallium/winsys/drm/nouveau/nouveau_lock.c
index 9adb9ac854..9adb9ac854 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_lock.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_lock.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_notifier.c b/src/gallium/winsys/drm/nouveau/nouveau_notifier.c
index 01e8f38440..01e8f38440 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_notifier.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_notifier.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_pushbuf.c b/src/gallium/winsys/drm/nouveau/nouveau_pushbuf.c
index 815046ba85..815046ba85 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_pushbuf.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_pushbuf.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_resource.c b/src/gallium/winsys/drm/nouveau/nouveau_resource.c
index 3bbcb5c45e..3bbcb5c45e 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_resource.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_resource.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_screen.c b/src/gallium/winsys/drm/nouveau/nouveau_screen.c
index df1fe7e69b..df1fe7e69b 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_screen.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_screen.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_screen.h b/src/gallium/winsys/drm/nouveau/nouveau_screen.h
index 388d6be9bb..388d6be9bb 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_screen.h
+++ b/src/gallium/winsys/drm/nouveau/nouveau_screen.h
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_swapbuffers.c b/src/gallium/winsys/drm/nouveau/nouveau_swapbuffers.c
index 70e0104e83..70e0104e83 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_swapbuffers.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_swapbuffers.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_swapbuffers.h b/src/gallium/winsys/drm/nouveau/nouveau_swapbuffers.h
index 825d3da6da..825d3da6da 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_swapbuffers.h
+++ b/src/gallium/winsys/drm/nouveau/nouveau_swapbuffers.h
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_winsys.c b/src/gallium/winsys/drm/nouveau/nouveau_winsys.c
index 5eabbc8893..0878840dcc 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_winsys.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_winsys.c
@@ -1,4 +1,4 @@
-#include "pipe/p_util.h"
+#include "util/u_memory.h"
 
 #include "nouveau_context.h"
 #include "nouveau_screen.h"
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_winsys_pipe.c b/src/gallium/winsys/drm/nouveau/nouveau_winsys_pipe.c
index 8a2870a2ff..5276806de6 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_winsys_pipe.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_winsys_pipe.c
@@ -1,8 +1,9 @@
 #include "pipe/p_winsys.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_util.h"
 #include "pipe/p_inlines.h"
 
+#include "util/u_memory.h"
+
 #include "nouveau_context.h"
 #include "nouveau_local.h"
 #include "nouveau_screen.h"
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_winsys_pipe.h b/src/gallium/winsys/drm/nouveau/nouveau_winsys_pipe.h
index 6a03ac0d77..6a03ac0d77 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_winsys_pipe.h
+++ b/src/gallium/winsys/drm/nouveau/nouveau_winsys_pipe.h
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_winsys_softpipe.c b/src/gallium/winsys/drm/nouveau/nouveau_winsys_softpipe.c
index 704f6c7750..704f6c7750 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_winsys_softpipe.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_winsys_softpipe.c
diff --git a/src/gallium/winsys/dri/nouveau/nv04_surface.c b/src/gallium/winsys/drm/nouveau/nv04_surface.c
index 8fa3d106c8..8fa3d106c8 100644
--- a/src/gallium/winsys/dri/nouveau/nv04_surface.c
+++ b/src/gallium/winsys/drm/nouveau/nv04_surface.c
diff --git a/src/gallium/winsys/dri/nouveau/nv50_surface.c b/src/gallium/winsys/drm/nouveau/nv50_surface.c
index c8ab7f690f..c8ab7f690f 100644
--- a/src/gallium/winsys/dri/nouveau/nv50_surface.c
+++ b/src/gallium/winsys/drm/nouveau/nv50_surface.c