Merge commit 'origin/master' into gallium-0.2

[mesa.git] / src / gallium / drivers / nv30 / nv30_surface.c

diff --git a/src/gallium/drivers/nv30/nv30_surface.c b/src/gallium/drivers/nv30/nv30_surface.c
index b22211ac86e0151145d75de93310b727f482c760..d3376a73bf55a55508a5161291d198d3a4b5371f 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_surface.c
+++ b/src/gallium/drivers/nv30/nv30_surface.c
@@ -28,13 +28,13 @@
 
 #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,
+nv30_surface_copy(struct pipe_context *pipe, boolean do_flip,
                  struct pipe_surface *dest, unsigned destx, unsigned desty,
                  struct pipe_surface *src, unsigned srcx, unsigned srcy,
                  unsigned width, unsigned height)