nouveau: match gallium code reorginisation.

That was... fun..

src/gallium/drivers/Makefile

@@ -6,7 +6,8 @@ ifeq ($(CONFIG_NAME), linux-cell)
 CELL_DIR = cell
 endif
 
-SUBDIRS = softpipe i915simple i965simple failover pipebuffer $(CELL_DIR)
+SUBDIRS = softpipe i915simple i965simple nv30 nv40 nv50 \
+	  failover pipebuffer $(CELL_DIR)
 
 
 default: subdirs

src/gallium/drivers/nouveau/nouveau_push.h

@@ -1,7 +1,7 @@
 #ifndef __NOUVEAU_PUSH_H__
 #define __NOUVEAU_PUSH_H__
 
-#include "pipe/nouveau/nouveau_winsys.h"
+#include "nouveau/nouveau_winsys.h"
 
 #ifndef NOUVEAU_PUSH_CONTEXT
 #error undefined push context

src/gallium/drivers/nouveau/nouveau_winsys.h

@@ -5,13 +5,13 @@
 #include "pipe/p_winsys.h"
 #include "pipe/p_defines.h"
 
-#include "pipe/nouveau/nouveau_bo.h"
-#include "pipe/nouveau/nouveau_channel.h"
-#include "pipe/nouveau/nouveau_class.h"
-#include "pipe/nouveau/nouveau_grobj.h"
-#include "pipe/nouveau/nouveau_notifier.h"
-#include "pipe/nouveau/nouveau_resource.h"
-#include "pipe/nouveau/nouveau_pushbuf.h"
+#include "nouveau/nouveau_bo.h"
+#include "nouveau/nouveau_channel.h"
+#include "nouveau/nouveau_class.h"
+#include "nouveau/nouveau_grobj.h"
+#include "nouveau/nouveau_notifier.h"
+#include "nouveau/nouveau_resource.h"
+#include "nouveau/nouveau_pushbuf.h"
 
 struct nouveau_winsys {
 	struct nouveau_context *nv;

src/gallium/drivers/nv30/Makefile

@@ -23,7 +23,7 @@ C_SOURCES = \
 
 ASM_SOURCES = 
 
-include ../Makefile.template
+include ../../Makefile.template
 
 symlinks:
 

src/gallium/drivers/nv30/nv30_context.c

@@ -1,4 +1,4 @@
-#include "pipe/draw/draw_context.h"
+#include "draw/draw_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_winsys.h"
 #include "pipe/p_util.h"

src/gallium/drivers/nv30/nv30_context.h

@@ -5,14 +5,14 @@
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
 
-#include "pipe/draw/draw_vertex.h"
+#include "draw/draw_vertex.h"
 
-#include "pipe/nouveau/nouveau_winsys.h"
-#include "pipe/nouveau/nouveau_gldefs.h"
+#include "nouveau/nouveau_winsys.h"
+#include "nouveau/nouveau_gldefs.h"
 
 #define NOUVEAU_PUSH_CONTEXT(ctx)                                              \
 	struct nv30_context *ctx = nv30
-#include "pipe/nouveau/nouveau_push.h"
+#include "nouveau/nouveau_push.h"
 
 #include "nv30_state.h"
 

src/gallium/drivers/nv30/nv30_draw.c

@@ -1,4 +1,4 @@
-#include "pipe/draw/draw_private.h"
+#include "draw/draw_private.h"
 #include "pipe/p_util.h"
 
 #include "nv30_context.h"

src/gallium/drivers/nv30/nv30_fragprog.c

@@ -4,8 +4,8 @@
 #include "pipe/p_util.h"
 
 #include "pipe/p_shader_tokens.h"
-#include "pipe/tgsi/util/tgsi_parse.h"
-#include "pipe/tgsi/util/tgsi_util.h"
+#include "tgsi/util/tgsi_parse.h"
+#include "tgsi/util/tgsi_util.h"
 
 #include "nv30_context.h"
 

src/gallium/drivers/nv30/nv30_surface.c

@@ -31,7 +31,7 @@
 #include "pipe/p_util.h"
 #include "pipe/p_winsys.h"
 #include "pipe/p_inlines.h"
-#include "pipe/util/p_tile.h"
+#include "util/p_tile.h"
 
 static boolean
 nv30_surface_format_supported(struct pipe_context *pipe,
@@ -104,9 +104,10 @@ nv30_get_tex_surface(struct pipe_context *pipe, struct pipe_texture *pt,
 }
 
 static void
-nv30_surface_copy(struct pipe_context *pipe, struct pipe_surface *dest,
-		  unsigned destx, unsigned desty, struct pipe_surface *src,
-		  unsigned srcx, unsigned srcy, unsigned width, unsigned height)
+nv30_surface_copy(struct pipe_context *pipe, unsigned do_flip,
+		  struct pipe_surface *dest, unsigned destx, unsigned desty,
+		  struct pipe_surface *src, unsigned srcx, unsigned srcy,
+		  unsigned width, unsigned height)
 {
 	struct nv30_context *nv30 = nv30_context(pipe);
 	struct nouveau_winsys *nvws = nv30->nvws;

src/gallium/drivers/nv30/nv30_vbo.c

@@ -5,8 +5,8 @@
 #include "nv30_context.h"
 #include "nv30_state.h"
 
-#include "pipe/nouveau/nouveau_channel.h"
-#include "pipe/nouveau/nouveau_pushbuf.h"
+#include "nouveau/nouveau_channel.h"
+#include "nouveau/nouveau_pushbuf.h"
 
 static INLINE int
 nv30_vbo_ncomp(uint format)

src/gallium/drivers/nv30/nv30_vertprog.c

@@ -4,7 +4,7 @@
 #include "pipe/p_util.h"
 
 #include "pipe/p_shader_tokens.h"
-#include "pipe/tgsi/util/tgsi_parse.h"
+#include "tgsi/util/tgsi_parse.h"
 
 #include "nv30_context.h"
 #include "nv30_state.h"

src/gallium/drivers/nv40/Makefile

@@ -23,7 +23,7 @@ C_SOURCES = \
 
 ASM_SOURCES = 
 
-include ../Makefile.template
+include ../../Makefile.template
 
 symlinks:
 

src/gallium/drivers/nv40/nv40_context.c

@@ -1,4 +1,4 @@
-#include "pipe/draw/draw_context.h"
+#include "draw/draw_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_winsys.h"
 #include "pipe/p_util.h"

src/gallium/drivers/nv40/nv40_context.h

@@ -5,15 +5,15 @@
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
 
-#include "pipe/draw/draw_vertex.h"
+#include "draw/draw_vertex.h"
 
-#include "pipe/nouveau/nouveau_winsys.h"
-#include "pipe/nouveau/nouveau_gldefs.h"
+#include "nouveau/nouveau_winsys.h"
+#include "nouveau/nouveau_gldefs.h"
 
 #define NOUVEAU_PUSH_CONTEXT(ctx)                                              \
 	struct nv40_channel_context *ctx = nv40->hw
-#include "pipe/nouveau/nouveau_push.h"
-#include "pipe/nouveau/nouveau_stateobj.h"
+#include "nouveau/nouveau_push.h"
+#include "nouveau/nouveau_stateobj.h"
 
 #include "nv40_state.h"
 

src/gallium/drivers/nv40/nv40_draw.c

@@ -1,4 +1,4 @@
-#include "pipe/draw/draw_private.h"
+#include "draw/draw_private.h"
 #include "pipe/p_util.h"
 
 #include "nv40_context.h"

src/gallium/drivers/nv40/nv40_fragprog.c

@@ -3,8 +3,8 @@
 #include "pipe/p_state.h"
 
 #include "pipe/p_shader_tokens.h"
-#include "pipe/tgsi/util/tgsi_parse.h"
-#include "pipe/tgsi/util/tgsi_util.h"
+#include "tgsi/util/tgsi_parse.h"
+#include "tgsi/util/tgsi_util.h"
 
 #include "nv40_context.h"
 

src/gallium/drivers/nv40/nv40_surface.c

@@ -31,7 +31,7 @@
 #include "pipe/p_util.h"
 #include "pipe/p_winsys.h"
 #include "pipe/p_inlines.h"
-#include "pipe/util/p_tile.h"
+#include "util/p_tile.h"
 
 static boolean
 nv40_surface_format_supported(struct pipe_context *pipe,
@@ -104,9 +104,10 @@ nv40_get_tex_surface(struct pipe_context *pipe, struct pipe_texture *pt,
 }
 
 static void
-nv40_surface_copy(struct pipe_context *pipe, struct pipe_surface *dest,
-		  unsigned destx, unsigned desty, struct pipe_surface *src,
-		  unsigned srcx, unsigned srcy, unsigned width, unsigned height)
+nv40_surface_copy(struct pipe_context *pipe, unsigned do_flip,
+		  struct pipe_surface *dest, unsigned destx, unsigned desty,
+		  struct pipe_surface *src, unsigned srcx, unsigned srcy,
+		  unsigned width, unsigned height)
 {
 	struct nv40_context *nv40 = nv40_context(pipe);
 	struct nouveau_winsys *nvws = nv40->nvws;

src/gallium/drivers/nv40/nv40_vbo.c

@@ -5,8 +5,8 @@
 #include "nv40_context.h"
 #include "nv40_state.h"
 
-#include "pipe/nouveau/nouveau_channel.h"
-#include "pipe/nouveau/nouveau_pushbuf.h"
+#include "nouveau/nouveau_channel.h"
+#include "nouveau/nouveau_pushbuf.h"
 
 static INLINE int
 nv40_vbo_ncomp(uint format)

src/gallium/drivers/nv40/nv40_vertprog.c

@@ -3,7 +3,7 @@
 #include "pipe/p_state.h"
 
 #include "pipe/p_shader_tokens.h"
-#include "pipe/tgsi/util/tgsi_parse.h"
+#include "tgsi/util/tgsi_parse.h"
 
 #include "nv40_context.h"
 #include "nv40_state.h"

src/gallium/drivers/nv50/Makefile

@@ -19,7 +19,7 @@ C_SOURCES = \
 
 ASM_SOURCES = 
 
-include ../Makefile.template
+include ../../Makefile.template
 
 symlinks:
 

src/gallium/drivers/nv50/nv50_context.c

@@ -1,4 +1,4 @@
-#include "pipe/draw/draw_context.h"
+#include "draw/draw_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_winsys.h"
 #include "pipe/p_util.h"

src/gallium/drivers/nv50/nv50_context.h

@@ -5,14 +5,14 @@
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
 
-#include "pipe/draw/draw_vertex.h"
+#include "draw/draw_vertex.h"
 
-#include "pipe/nouveau/nouveau_winsys.h"
-#include "pipe/nouveau/nouveau_gldefs.h"
+#include "nouveau/nouveau_winsys.h"
+#include "nouveau/nouveau_gldefs.h"
 
 #define NOUVEAU_PUSH_CONTEXT(ctx)                                              \
 	struct nv50_context *ctx = nv50
-#include "pipe/nouveau/nouveau_push.h"
+#include "nouveau/nouveau_push.h"
 
 #include "nv50_state.h"
 

src/gallium/drivers/nv50/nv50_draw.c

@@ -1,4 +1,4 @@
-#include "pipe/draw/draw_private.h"
+#include "draw/draw_private.h"
 #include "pipe/p_util.h"
 
 #include "nv50_context.h"

src/gallium/drivers/nv50/nv50_surface.c

@@ -31,7 +31,7 @@
 #include "pipe/p_util.h"
 #include "pipe/p_winsys.h"
 #include "pipe/p_inlines.h"
-#include "pipe/util/p_tile.h"
+#include "util/p_tile.h"
 
 static struct pipe_surface *
 nv50_get_tex_surface(struct pipe_context *pipe,
@@ -43,9 +43,10 @@ nv50_get_tex_surface(struct pipe_context *pipe,
 }
 
 static void
-nv50_surface_copy(struct pipe_context *pipe, struct pipe_surface *dest,
-		  unsigned destx, unsigned desty, struct pipe_surface *src,
-		  unsigned srcx, unsigned srcy, unsigned width, unsigned height)
+nv50_surface_copy(struct pipe_context *pipe, unsigned flip,
+		  struct pipe_surface *dest, unsigned destx, unsigned desty,
+		  struct pipe_surface *src, unsigned srcx, unsigned srcy,
+		  unsigned width, unsigned height)
 {
 	struct nv50_context *nv50 = (struct nv50_context *)pipe;
 	struct nouveau_winsys *nvws = nv50->nvws;

src/gallium/winsys/dri/nouveau/Makefile

@@ -7,10 +7,10 @@ LIBNAME = nouveau_dri.so
 MINIGLX_SOURCES =
 
 PIPE_DRIVERS = \
-	$(TOP)/src/mesa/pipe/softpipe/libsoftpipe.a \
-	$(TOP)/src/mesa/pipe/nv30/libnv30.a \
-	$(TOP)/src/mesa/pipe/nv40/libnv40.a \
-	$(TOP)/src/mesa/pipe/nv50/libnv50.a
+	$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
+	$(TOP)/src/gallium/drivers/nv30/libnv30.a \
+	$(TOP)/src/gallium/drivers/nv40/libnv40.a \
+	$(TOP)/src/gallium/drivers/nv50/libnv50.a
 
 DRIVER_SOURCES = \
 	nouveau_bo.c \

src/gallium/winsys/dri/nouveau/nouveau_context.h

@@ -4,7 +4,7 @@
 #include "dri_util.h"
 #include "xmlconfig.h"
 
-#include "pipe/nouveau/nouveau_winsys.h"
+#include "nouveau/nouveau_winsys.h"
 #include "nouveau_device.h"
 #include "nouveau_drmif.h"
 #include "nouveau_dma.h"

src/gallium/winsys/dri/nouveau/nouveau_drmif.h

@@ -28,12 +28,12 @@
 #include <nouveau_drm.h>
 
 #include "nouveau_device.h"
-#include "pipe/nouveau/nouveau_channel.h"
-#include "pipe/nouveau/nouveau_grobj.h"
-#include "pipe/nouveau/nouveau_notifier.h"
-#include "pipe/nouveau/nouveau_bo.h"
-#include "pipe/nouveau/nouveau_resource.h"
-#include "pipe/nouveau/nouveau_pushbuf.h"
+#include "nouveau/nouveau_channel.h"
+#include "nouveau/nouveau_grobj.h"
+#include "nouveau/nouveau_notifier.h"
+#include "nouveau/nouveau_bo.h"
+#include "nouveau/nouveau_resource.h"
+#include "nouveau/nouveau_pushbuf.h"
 
 struct nouveau_device_priv {
 	struct nouveau_device base;

src/gallium/winsys/dri/nouveau/nouveau_winsys.c

@@ -3,7 +3,7 @@
 #include "nouveau_context.h"
 #include "nouveau_winsys_pipe.h"
 
-#include "pipe/nouveau/nouveau_winsys.h"
+#include "nouveau/nouveau_winsys.h"
 
 static int
 nouveau_pipe_notifier_alloc(struct nouveau_winsys *nvws, int count,

src/gallium/winsys/dri/nouveau/nouveau_winsys_softpipe.c

@@ -33,7 +33,7 @@
 
 #include "pipe/p_defines.h"
 #include "pipe/p_format.h"
-#include "pipe/softpipe/sp_winsys.h"
+#include "softpipe/sp_winsys.h"
 
 #include "nouveau_context.h"
 #include "nouveau_winsys_pipe.h"