nouveau: match gallium code reorginisation.

That was... fun..

diff --git a/src/gallium/drivers/Makefile b/src/gallium/drivers/Makefile
index c0345a9..58df6c5 100644 (file)
--- a/src/gallium/drivers/Makefile
+++ b/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

diff --git a/src/mesa/pipe/nouveau/nouveau_bo.h b/src/gallium/drivers/nouveau/nouveau_bo.h
similarity index 100%
rename from src/mesa/pipe/nouveau/nouveau_bo.h
rename to src/gallium/drivers/nouveau/nouveau_bo.h

diff --git a/src/mesa/pipe/nouveau/nouveau_channel.h b/src/gallium/drivers/nouveau/nouveau_channel.h
similarity index 100%
rename from src/mesa/pipe/nouveau/nouveau_channel.h
rename to src/gallium/drivers/nouveau/nouveau_channel.h

diff --git a/src/mesa/pipe/nouveau/nouveau_class.h b/src/gallium/drivers/nouveau/nouveau_class.h
similarity index 100%
rename from src/mesa/pipe/nouveau/nouveau_class.h
rename to src/gallium/drivers/nouveau/nouveau_class.h

diff --git a/src/mesa/pipe/nouveau/nouveau_gldefs.h b/src/gallium/drivers/nouveau/nouveau_gldefs.h
similarity index 100%
rename from src/mesa/pipe/nouveau/nouveau_gldefs.h
rename to src/gallium/drivers/nouveau/nouveau_gldefs.h

diff --git a/src/mesa/pipe/nouveau/nouveau_grobj.h b/src/gallium/drivers/nouveau/nouveau_grobj.h
similarity index 100%
rename from src/mesa/pipe/nouveau/nouveau_grobj.h
rename to src/gallium/drivers/nouveau/nouveau_grobj.h

diff --git a/src/mesa/pipe/nouveau/nouveau_notifier.h b/src/gallium/drivers/nouveau/nouveau_notifier.h
similarity index 100%
rename from src/mesa/pipe/nouveau/nouveau_notifier.h
rename to src/gallium/drivers/nouveau/nouveau_notifier.h

diff --git a/src/mesa/pipe/nouveau/nouveau_push.h b/src/gallium/drivers/nouveau/nouveau_push.h
similarity index 98%
rename from src/mesa/pipe/nouveau/nouveau_push.h
rename to src/gallium/drivers/nouveau/nouveau_push.h
index 6794726..c5c5d98 100644 (file)
--- a/src/mesa/pipe/nouveau/nouveau_push.h
+++ b/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

diff --git a/src/mesa/pipe/nouveau/nouveau_pushbuf.h b/src/gallium/drivers/nouveau/nouveau_pushbuf.h
similarity index 100%
rename from src/mesa/pipe/nouveau/nouveau_pushbuf.h
rename to src/gallium/drivers/nouveau/nouveau_pushbuf.h

diff --git a/src/mesa/pipe/nouveau/nouveau_resource.h b/src/gallium/drivers/nouveau/nouveau_resource.h
similarity index 100%
rename from src/mesa/pipe/nouveau/nouveau_resource.h
rename to src/gallium/drivers/nouveau/nouveau_resource.h

diff --git a/src/mesa/pipe/nouveau/nouveau_stateobj.h b/src/gallium/drivers/nouveau/nouveau_stateobj.h
similarity index 100%
rename from src/mesa/pipe/nouveau/nouveau_stateobj.h
rename to src/gallium/drivers/nouveau/nouveau_stateobj.h

diff --git a/src/mesa/pipe/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h
similarity index 86%
rename from src/mesa/pipe/nouveau/nouveau_winsys.h
rename to src/gallium/drivers/nouveau/nouveau_winsys.h
index 818ae9a..b5e470c 100644 (file)
--- a/src/mesa/pipe/nouveau/nouveau_winsys.h
+++ b/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;

diff --git a/src/mesa/pipe/nv30/Makefile b/src/gallium/drivers/nv30/Makefile
similarity index 92%
rename from src/mesa/pipe/nv30/Makefile
rename to src/gallium/drivers/nv30/Makefile
index dd4b7e7..b7c252f 100644 (file)
--- a/src/mesa/pipe/nv30/Makefile
+++ b/src/gallium/drivers/nv30/Makefile
@@ -23,7 +23,7 @@ C_SOURCES = \
 
 ASM_SOURCES = 
 
-include ../Makefile.template
+include ../../Makefile.template
 
 symlinks:
 

diff --git a/src/mesa/pipe/nv30/nv30_clear.c b/src/gallium/drivers/nv30/nv30_clear.c
similarity index 100%
rename from src/mesa/pipe/nv30/nv30_clear.c
rename to src/gallium/drivers/nv30/nv30_clear.c

diff --git a/src/mesa/pipe/nv30/nv30_context.c b/src/gallium/drivers/nv30/nv30_context.c
similarity index 99%
rename from src/mesa/pipe/nv30/nv30_context.c
rename to src/gallium/drivers/nv30/nv30_context.c
index d12aab8..e9afeb8 100644 (file)
--- a/src/mesa/pipe/nv30/nv30_context.c
+++ b/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"

diff --git a/src/mesa/pipe/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
similarity index 95%
rename from src/mesa/pipe/nv30/nv30_context.h
rename to src/gallium/drivers/nv30/nv30_context.h
index f6c6954..d6d16ee 100644 (file)
--- a/src/mesa/pipe/nv30/nv30_context.h
+++ b/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"
 

diff --git a/src/mesa/pipe/nv30/nv30_draw.c b/src/gallium/drivers/nv30/nv30_draw.c
similarity index 97%
rename from src/mesa/pipe/nv30/nv30_draw.c
rename to src/gallium/drivers/nv30/nv30_draw.c
index bdeb975..59a7265 100644 (file)
--- a/src/mesa/pipe/nv30/nv30_draw.c
+++ b/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"

diff --git a/src/mesa/pipe/nv30/nv30_fragprog.c b/src/gallium/drivers/nv30/nv30_fragprog.c
similarity index 99%
rename from src/mesa/pipe/nv30/nv30_fragprog.c
rename to src/gallium/drivers/nv30/nv30_fragprog.c
index 0db1ac8..09ad555 100644 (file)
--- a/src/mesa/pipe/nv30/nv30_fragprog.c
+++ b/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"
 

diff --git a/src/mesa/pipe/nv30/nv30_fragtex.c b/src/gallium/drivers/nv30/nv30_fragtex.c
similarity index 100%
rename from src/mesa/pipe/nv30/nv30_fragtex.c
rename to src/gallium/drivers/nv30/nv30_fragtex.c

diff --git a/src/mesa/pipe/nv30/nv30_miptree.c b/src/gallium/drivers/nv30/nv30_miptree.c
similarity index 100%
rename from src/mesa/pipe/nv30/nv30_miptree.c
rename to src/gallium/drivers/nv30/nv30_miptree.c

diff --git a/src/mesa/pipe/nv30/nv30_query.c b/src/gallium/drivers/nv30/nv30_query.c
similarity index 100%
rename from src/mesa/pipe/nv30/nv30_query.c
rename to src/gallium/drivers/nv30/nv30_query.c

diff --git a/src/mesa/pipe/nv30/nv30_shader.h b/src/gallium/drivers/nv30/nv30_shader.h
similarity index 100%
rename from src/mesa/pipe/nv30/nv30_shader.h
rename to src/gallium/drivers/nv30/nv30_shader.h

diff --git a/src/mesa/pipe/nv30/nv30_state.c b/src/gallium/drivers/nv30/nv30_state.c
similarity index 100%
rename from src/mesa/pipe/nv30/nv30_state.c
rename to src/gallium/drivers/nv30/nv30_state.c

diff --git a/src/mesa/pipe/nv30/nv30_state.h b/src/gallium/drivers/nv30/nv30_state.h
similarity index 100%
rename from src/mesa/pipe/nv30/nv30_state.h
rename to src/gallium/drivers/nv30/nv30_state.h

diff --git a/src/mesa/pipe/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
similarity index 100%
rename from src/mesa/pipe/nv30/nv30_state_emit.c
rename to src/gallium/drivers/nv30/nv30_state_emit.c

diff --git a/src/mesa/pipe/nv30/nv30_surface.c b/src/gallium/drivers/nv30/nv30_surface.c
similarity index 94%
rename from src/mesa/pipe/nv30/nv30_surface.c
rename to src/gallium/drivers/nv30/nv30_surface.c
index 31745e3..9749656 100644 (file)
--- a/src/mesa/pipe/nv30/nv30_surface.c
+++ b/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;

diff --git a/src/mesa/pipe/nv30/nv30_vbo.c b/src/gallium/drivers/nv30/nv30_vbo.c
similarity index 99%
rename from src/mesa/pipe/nv30/nv30_vbo.c
rename to src/gallium/drivers/nv30/nv30_vbo.c
index 57fb9bc..9e00cda 100644 (file)
--- a/src/mesa/pipe/nv30/nv30_vbo.c
+++ b/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)

diff --git a/src/mesa/pipe/nv30/nv30_vertprog.c b/src/gallium/drivers/nv30/nv30_vertprog.c
similarity index 99%
rename from src/mesa/pipe/nv30/nv30_vertprog.c
rename to src/gallium/drivers/nv30/nv30_vertprog.c
index c96210d..4a8269d 100644 (file)
--- a/src/mesa/pipe/nv30/nv30_vertprog.c
+++ b/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"

diff --git a/src/mesa/pipe/nv40/Makefile b/src/gallium/drivers/nv40/Makefile
similarity index 92%
rename from src/mesa/pipe/nv40/Makefile
rename to src/gallium/drivers/nv40/Makefile
index c9c3a80..2a9de4a 100644 (file)
--- a/src/mesa/pipe/nv40/Makefile
+++ b/src/gallium/drivers/nv40/Makefile
@@ -23,7 +23,7 @@ C_SOURCES = \
 
 ASM_SOURCES = 
 
-include ../Makefile.template
+include ../../Makefile.template
 
 symlinks:
 

diff --git a/src/mesa/pipe/nv40/nv40_clear.c b/src/gallium/drivers/nv40/nv40_clear.c
similarity index 100%
rename from src/mesa/pipe/nv40/nv40_clear.c
rename to src/gallium/drivers/nv40/nv40_clear.c

diff --git a/src/mesa/pipe/nv40/nv40_context.c b/src/gallium/drivers/nv40/nv40_context.c
similarity index 99%
rename from src/mesa/pipe/nv40/nv40_context.c
rename to src/gallium/drivers/nv40/nv40_context.c
index 6e86ca0..8b5cc69 100644 (file)
--- a/src/mesa/pipe/nv40/nv40_context.c
+++ b/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"

diff --git a/src/mesa/pipe/nv40/nv40_context.h b/src/gallium/drivers/nv40/nv40_context.h
similarity index 95%
rename from src/mesa/pipe/nv40/nv40_context.h
rename to src/gallium/drivers/nv40/nv40_context.h
index cf2a144..f511759 100644 (file)
--- a/src/mesa/pipe/nv40/nv40_context.h
+++ b/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"
 

diff --git a/src/mesa/pipe/nv40/nv40_dma.h b/src/gallium/drivers/nv40/nv40_dma.h
similarity index 100%
rename from src/mesa/pipe/nv40/nv40_dma.h
rename to src/gallium/drivers/nv40/nv40_dma.h

diff --git a/src/mesa/pipe/nv40/nv40_draw.c b/src/gallium/drivers/nv40/nv40_draw.c
similarity index 97%
rename from src/mesa/pipe/nv40/nv40_draw.c
rename to src/gallium/drivers/nv40/nv40_draw.c
index d361d5f..a39bb85 100644 (file)
--- a/src/mesa/pipe/nv40/nv40_draw.c
+++ b/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"

diff --git a/src/mesa/pipe/nv40/nv40_fragprog.c b/src/gallium/drivers/nv40/nv40_fragprog.c
similarity index 99%
rename from src/mesa/pipe/nv40/nv40_fragprog.c
rename to src/gallium/drivers/nv40/nv40_fragprog.c
index 7487fb8..07a418c 100644 (file)
--- a/src/mesa/pipe/nv40/nv40_fragprog.c
+++ b/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"
 

diff --git a/src/mesa/pipe/nv40/nv40_fragtex.c b/src/gallium/drivers/nv40/nv40_fragtex.c
similarity index 100%
rename from src/mesa/pipe/nv40/nv40_fragtex.c
rename to src/gallium/drivers/nv40/nv40_fragtex.c

diff --git a/src/mesa/pipe/nv40/nv40_miptree.c b/src/gallium/drivers/nv40/nv40_miptree.c
similarity index 100%
rename from src/mesa/pipe/nv40/nv40_miptree.c
rename to src/gallium/drivers/nv40/nv40_miptree.c

diff --git a/src/mesa/pipe/nv40/nv40_query.c b/src/gallium/drivers/nv40/nv40_query.c
similarity index 100%
rename from src/mesa/pipe/nv40/nv40_query.c
rename to src/gallium/drivers/nv40/nv40_query.c

diff --git a/src/mesa/pipe/nv40/nv40_shader.h b/src/gallium/drivers/nv40/nv40_shader.h
similarity index 100%
rename from src/mesa/pipe/nv40/nv40_shader.h
rename to src/gallium/drivers/nv40/nv40_shader.h

diff --git a/src/mesa/pipe/nv40/nv40_state.c b/src/gallium/drivers/nv40/nv40_state.c
similarity index 100%
rename from src/mesa/pipe/nv40/nv40_state.c
rename to src/gallium/drivers/nv40/nv40_state.c

diff --git a/src/mesa/pipe/nv40/nv40_state.h b/src/gallium/drivers/nv40/nv40_state.h
similarity index 100%
rename from src/mesa/pipe/nv40/nv40_state.h
rename to src/gallium/drivers/nv40/nv40_state.h

diff --git a/src/mesa/pipe/nv40/nv40_state_emit.c b/src/gallium/drivers/nv40/nv40_state_emit.c
similarity index 100%
rename from src/mesa/pipe/nv40/nv40_state_emit.c
rename to src/gallium/drivers/nv40/nv40_state_emit.c

diff --git a/src/mesa/pipe/nv40/nv40_surface.c b/src/gallium/drivers/nv40/nv40_surface.c
similarity index 94%
rename from src/mesa/pipe/nv40/nv40_surface.c
rename to src/gallium/drivers/nv40/nv40_surface.c
index d8f87d9..9726ab4 100644 (file)
--- a/src/mesa/pipe/nv40/nv40_surface.c
+++ b/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;

diff --git a/src/mesa/pipe/nv40/nv40_vbo.c b/src/gallium/drivers/nv40/nv40_vbo.c
similarity index 99%
rename from src/mesa/pipe/nv40/nv40_vbo.c
rename to src/gallium/drivers/nv40/nv40_vbo.c
index 6b1ac65..fa827ef 100644 (file)
--- a/src/mesa/pipe/nv40/nv40_vbo.c
+++ b/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)

diff --git a/src/mesa/pipe/nv40/nv40_vertprog.c b/src/gallium/drivers/nv40/nv40_vertprog.c
similarity index 99%
rename from src/mesa/pipe/nv40/nv40_vertprog.c
rename to src/gallium/drivers/nv40/nv40_vertprog.c
index d57e3ca..9f4738b 100644 (file)
--- a/src/mesa/pipe/nv40/nv40_vertprog.c
+++ b/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"

diff --git a/src/mesa/pipe/nv50/Makefile b/src/gallium/drivers/nv50/Makefile
similarity index 90%
rename from src/mesa/pipe/nv50/Makefile
rename to src/gallium/drivers/nv50/Makefile
index d3d011b..68eb49f 100644 (file)
--- a/src/mesa/pipe/nv50/Makefile
+++ b/src/gallium/drivers/nv50/Makefile
@@ -19,7 +19,7 @@ C_SOURCES = \
 
 ASM_SOURCES = 
 
-include ../Makefile.template
+include ../../Makefile.template
 
 symlinks:
 

diff --git a/src/mesa/pipe/nv50/nv50_clear.c b/src/gallium/drivers/nv50/nv50_clear.c
similarity index 100%
rename from src/mesa/pipe/nv50/nv50_clear.c
rename to src/gallium/drivers/nv50/nv50_clear.c

diff --git a/src/mesa/pipe/nv50/nv50_context.c b/src/gallium/drivers/nv50/nv50_context.c
similarity index 99%
rename from src/mesa/pipe/nv50/nv50_context.c
rename to src/gallium/drivers/nv50/nv50_context.c
index 33c8eeb..3c5a54b 100644 (file)
--- a/src/mesa/pipe/nv50/nv50_context.c
+++ b/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"

diff --git a/src/mesa/pipe/nv50/nv50_context.h b/src/gallium/drivers/nv50/nv50_context.h
similarity index 90%
rename from src/mesa/pipe/nv50/nv50_context.h
rename to src/gallium/drivers/nv50/nv50_context.h
index 5491c0c..b99254f 100644 (file)
--- a/src/mesa/pipe/nv50/nv50_context.h
+++ b/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"
 

diff --git a/src/mesa/pipe/nv50/nv50_draw.c b/src/gallium/drivers/nv50/nv50_draw.c
similarity index 96%
rename from src/mesa/pipe/nv50/nv50_draw.c
rename to src/gallium/drivers/nv50/nv50_draw.c
index 85d347f..c6ed683 100644 (file)
--- a/src/mesa/pipe/nv50/nv50_draw.c
+++ b/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"

diff --git a/src/mesa/pipe/nv50/nv50_miptree.c b/src/gallium/drivers/nv50/nv50_miptree.c
similarity index 100%
rename from src/mesa/pipe/nv50/nv50_miptree.c
rename to src/gallium/drivers/nv50/nv50_miptree.c

diff --git a/src/mesa/pipe/nv50/nv50_query.c b/src/gallium/drivers/nv50/nv50_query.c
similarity index 100%
rename from src/mesa/pipe/nv50/nv50_query.c
rename to src/gallium/drivers/nv50/nv50_query.c

diff --git a/src/mesa/pipe/nv50/nv50_state.c b/src/gallium/drivers/nv50/nv50_state.c
similarity index 100%
rename from src/mesa/pipe/nv50/nv50_state.c
rename to src/gallium/drivers/nv50/nv50_state.c

diff --git a/src/mesa/pipe/nv50/nv50_state.h b/src/gallium/drivers/nv50/nv50_state.h
similarity index 100%
rename from src/mesa/pipe/nv50/nv50_state.h
rename to src/gallium/drivers/nv50/nv50_state.h

diff --git a/src/mesa/pipe/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c
similarity index 91%
rename from src/mesa/pipe/nv50/nv50_surface.c
rename to src/gallium/drivers/nv50/nv50_surface.c
index cfb370d..ca92ff0 100644 (file)
--- a/src/mesa/pipe/nv50/nv50_surface.c
+++ b/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;

diff --git a/src/mesa/pipe/nv50/nv50_vbo.c b/src/gallium/drivers/nv50/nv50_vbo.c
similarity index 100%
rename from src/mesa/pipe/nv50/nv50_vbo.c
rename to src/gallium/drivers/nv50/nv50_vbo.c

diff --git a/src/mesa/drivers/dri/nouveau_winsys/Makefile b/src/gallium/winsys/dri/nouveau/Makefile
similarity index 77%
rename from src/mesa/drivers/dri/nouveau_winsys/Makefile
rename to src/gallium/winsys/dri/nouveau/Makefile
index 98ec5a7..b463f21 100644 (file)
--- a/src/mesa/drivers/dri/nouveau_winsys/Makefile
+++ b/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 \

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_bo.c b/src/gallium/winsys/dri/nouveau/nouveau_bo.c
similarity index 100%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_bo.c
rename to src/gallium/winsys/dri/nouveau/nouveau_bo.c

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_channel.c b/src/gallium/winsys/dri/nouveau/nouveau_channel.c
similarity index 100%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_channel.c
rename to src/gallium/winsys/dri/nouveau/nouveau_channel.c

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_context.c b/src/gallium/winsys/dri/nouveau/nouveau_context.c
similarity index 100%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_context.c
rename to src/gallium/winsys/dri/nouveau/nouveau_context.c

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_context.h b/src/gallium/winsys/dri/nouveau/nouveau_context.h
similarity index 98%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_context.h
rename to src/gallium/winsys/dri/nouveau/nouveau_context.h
index 7a74f7d..5805f96 100644 (file)
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_context.h
+++ b/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"

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_device.c b/src/gallium/winsys/dri/nouveau/nouveau_device.c
similarity index 100%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_device.c
rename to src/gallium/winsys/dri/nouveau/nouveau_device.c

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_device.h b/src/gallium/winsys/dri/nouveau/nouveau_device.h
similarity index 100%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_device.h
rename to src/gallium/winsys/dri/nouveau/nouveau_device.h

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_dma.c b/src/gallium/winsys/dri/nouveau/nouveau_dma.c
similarity index 100%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_dma.c
rename to src/gallium/winsys/dri/nouveau/nouveau_dma.c

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_dma.h b/src/gallium/winsys/dri/nouveau/nouveau_dma.h
similarity index 100%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_dma.h
rename to src/gallium/winsys/dri/nouveau/nouveau_dma.h

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_dri.h b/src/gallium/winsys/dri/nouveau/nouveau_dri.h
similarity index 100%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_dri.h
rename to src/gallium/winsys/dri/nouveau/nouveau_dri.h

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_drmif.h b/src/gallium/winsys/dri/nouveau/nouveau_drmif.h
similarity index 96%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_drmif.h
rename to src/gallium/winsys/dri/nouveau/nouveau_drmif.h
index 67e19f1..37e404f 100644 (file)
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_drmif.h
+++ b/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;

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_fence.c b/src/gallium/winsys/dri/nouveau/nouveau_fence.c
similarity index 100%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_fence.c
rename to src/gallium/winsys/dri/nouveau/nouveau_fence.c

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_grobj.c b/src/gallium/winsys/dri/nouveau/nouveau_grobj.c
similarity index 100%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_grobj.c
rename to src/gallium/winsys/dri/nouveau/nouveau_grobj.c

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_local.h b/src/gallium/winsys/dri/nouveau/nouveau_local.h
similarity index 100%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_local.h
rename to src/gallium/winsys/dri/nouveau/nouveau_local.h

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_lock.c b/src/gallium/winsys/dri/nouveau/nouveau_lock.c
similarity index 100%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_lock.c
rename to src/gallium/winsys/dri/nouveau/nouveau_lock.c

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_notifier.c b/src/gallium/winsys/dri/nouveau/nouveau_notifier.c
similarity index 100%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_notifier.c
rename to src/gallium/winsys/dri/nouveau/nouveau_notifier.c

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_pushbuf.c b/src/gallium/winsys/dri/nouveau/nouveau_pushbuf.c
similarity index 100%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_pushbuf.c
rename to src/gallium/winsys/dri/nouveau/nouveau_pushbuf.c

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_resource.c b/src/gallium/winsys/dri/nouveau/nouveau_resource.c
similarity index 100%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_resource.c
rename to src/gallium/winsys/dri/nouveau/nouveau_resource.c

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_screen.c b/src/gallium/winsys/dri/nouveau/nouveau_screen.c
similarity index 100%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_screen.c
rename to src/gallium/winsys/dri/nouveau/nouveau_screen.c

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_screen.h b/src/gallium/winsys/dri/nouveau/nouveau_screen.h
similarity index 100%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_screen.h
rename to src/gallium/winsys/dri/nouveau/nouveau_screen.h

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_swapbuffers.c b/src/gallium/winsys/dri/nouveau/nouveau_swapbuffers.c
similarity index 100%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_swapbuffers.c
rename to src/gallium/winsys/dri/nouveau/nouveau_swapbuffers.c

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_swapbuffers.h b/src/gallium/winsys/dri/nouveau/nouveau_swapbuffers.h
similarity index 100%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_swapbuffers.h
rename to src/gallium/winsys/dri/nouveau/nouveau_swapbuffers.h

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_winsys.c b/src/gallium/winsys/dri/nouveau/nouveau_winsys.c
similarity index 98%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_winsys.c
rename to src/gallium/winsys/dri/nouveau/nouveau_winsys.c
index 1494bd4..2ca05d8 100644 (file)
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_winsys.c
+++ b/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,

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_winsys_pipe.c b/src/gallium/winsys/dri/nouveau/nouveau_winsys_pipe.c
similarity index 100%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_winsys_pipe.c
rename to src/gallium/winsys/dri/nouveau/nouveau_winsys_pipe.c

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_winsys_pipe.h b/src/gallium/winsys/dri/nouveau/nouveau_winsys_pipe.h
similarity index 100%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_winsys_pipe.h
rename to src/gallium/winsys/dri/nouveau/nouveau_winsys_pipe.h

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_winsys_softpipe.c b/src/gallium/winsys/dri/nouveau/nouveau_winsys_softpipe.c
similarity index 98%
rename from src/mesa/drivers/dri/nouveau_winsys/nouveau_winsys_softpipe.c
rename to src/gallium/winsys/dri/nouveau/nouveau_winsys_softpipe.c
index 3908c17..0e1b427 100644 (file)
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_winsys_softpipe.c
+++ b/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"

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nv04_surface.c b/src/gallium/winsys/dri/nouveau/nv04_surface.c
similarity index 100%
rename from src/mesa/drivers/dri/nouveau_winsys/nv04_surface.c
rename to src/gallium/winsys/dri/nouveau/nv04_surface.c

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nv50_surface.c b/src/gallium/winsys/dri/nouveau/nv50_surface.c
similarity index 100%
rename from src/mesa/drivers/dri/nouveau_winsys/nv50_surface.c
rename to src/gallium/winsys/dri/nouveau/nv50_surface.c