nouveau: share pushbuf interface code between pipe drivers

10 files changed, 4 insertions, 10 deletions

diff --git a/src/mesa/pipe/nv40/nv40_clear.c b/src/mesa/pipe/nv40/nv40_clear.c
index 380a2a642f..2c4e8f01fd 100644
--- a/src/mesa/pipe/nv40/nv40_clear.c
+++ b/src/mesa/pipe/nv40/nv40_clear.c
@@ -3,8 +3,6 @@
 #include "pipe/p_state.h"
 
 #include "nv40_context.h"
-#include "nv40_dma.h"
-
 
 void
 nv40_clear(struct pipe_context *pipe, struct pipe_surface *ps,
diff --git a/src/mesa/pipe/nv40/nv40_context.c b/src/mesa/pipe/nv40/nv40_context.c
index 442ff04e75..334e50ef89 100644
--- a/src/mesa/pipe/nv40/nv40_context.c
+++ b/src/mesa/pipe/nv40/nv40_context.c
@@ -4,7 +4,6 @@
 #include "pipe/p_util.h"
 
 #include "nv40_context.h"
-#include "nv40_dma.h"
 
 static const char *
 nv40_get_name(struct pipe_context *pipe)
diff --git a/src/mesa/pipe/nv40/nv40_context.h b/src/mesa/pipe/nv40/nv40_context.h
index 0a89ae8bed..86aebbb927 100644
--- a/src/mesa/pipe/nv40/nv40_context.h
+++ b/src/mesa/pipe/nv40/nv40_context.h
@@ -10,6 +10,10 @@
 #include "pipe/nouveau/nouveau_winsys.h"
 #include "pipe/nouveau/nouveau_gldefs.h"
 
+#define NOUVEAU_PUSH_CONTEXT(ctx)                                              \
+	struct nv40_context *ctx = nv40
+#include "pipe/nouveau/nouveau_push.h"
+
 #include "nv40_state.h"
 
 #define NOUVEAU_ERR(fmt, args...) \
diff --git a/src/mesa/pipe/nv40/nv40_fragprog.c b/src/mesa/pipe/nv40/nv40_fragprog.c
index 01bf5c3460..fded11d170 100644
--- a/src/mesa/pipe/nv40/nv40_fragprog.c
+++ b/src/mesa/pipe/nv40/nv40_fragprog.c
@@ -7,7 +7,6 @@
 #include "pipe/tgsi/util/tgsi_util.h"
 
 #include "nv40_context.h"
-#include "nv40_dma.h"
 
 #define SWZ_X 0
 #define SWZ_Y 1
diff --git a/src/mesa/pipe/nv40/nv40_query.c b/src/mesa/pipe/nv40/nv40_query.c
index 6e5fcae8ca..ea30d3ede8 100644
--- a/src/mesa/pipe/nv40/nv40_query.c
+++ b/src/mesa/pipe/nv40/nv40_query.c
@@ -1,7 +1,6 @@
 #include "pipe/p_context.h"
 
 #include "nv40_context.h"
-#include "nv40_dma.h"
 
 struct nv40_query {
 	struct nouveau_resource *object;
diff --git a/src/mesa/pipe/nv40/nv40_state.c b/src/mesa/pipe/nv40/nv40_state.c
index 14e12626d4..41de5650aa 100644
--- a/src/mesa/pipe/nv40/nv40_state.c
+++ b/src/mesa/pipe/nv40/nv40_state.c
@@ -3,7 +3,6 @@
 #include "pipe/p_util.h"
 
 #include "nv40_context.h"
-#include "nv40_dma.h"
 #include "nv40_state.h"
 
 static void *
diff --git a/src/mesa/pipe/nv40/nv40_state_emit.c b/src/mesa/pipe/nv40/nv40_state_emit.c
index 080ade3827..7bb69e617e 100644
--- a/src/mesa/pipe/nv40/nv40_state_emit.c
+++ b/src/mesa/pipe/nv40/nv40_state_emit.c
@@ -1,5 +1,4 @@
 #include "nv40_context.h"
-#include "nv40_dma.h"
 #include "nv40_state.h"
 
 void
diff --git a/src/mesa/pipe/nv40/nv40_state_tex.c b/src/mesa/pipe/nv40/nv40_state_tex.c
index 8e8609f5c9..7c353c138f 100644
--- a/src/mesa/pipe/nv40/nv40_state_tex.c
+++ b/src/mesa/pipe/nv40/nv40_state_tex.c
@@ -1,5 +1,4 @@
 #include "nv40_context.h"
-#include "nv40_dma.h"
 
 #define _(m,tf,ts0x,ts0y,ts0z,ts0w,ts1x,ts1y,ts1z,ts1w)                        \
 {                                                                              \
diff --git a/src/mesa/pipe/nv40/nv40_vbo.c b/src/mesa/pipe/nv40/nv40_vbo.c
index d462e98400..7cf089e007 100644
--- a/src/mesa/pipe/nv40/nv40_vbo.c
+++ b/src/mesa/pipe/nv40/nv40_vbo.c
@@ -3,7 +3,6 @@
 #include "pipe/p_util.h"
 
 #include "nv40_context.h"
-#include "nv40_dma.h"
 #include "nv40_state.h"
 
 #include "pipe/nouveau/nouveau_channel.h"
diff --git a/src/mesa/pipe/nv40/nv40_vertprog.c b/src/mesa/pipe/nv40/nv40_vertprog.c
index 84618c1e1b..bd052fe834 100644
--- a/src/mesa/pipe/nv40/nv40_vertprog.c
+++ b/src/mesa/pipe/nv40/nv40_vertprog.c
@@ -6,7 +6,6 @@
 #include "pipe/tgsi/util/tgsi_parse.h"
 
 #include "nv40_context.h"
-#include "nv40_dma.h"
 #include "nv40_state.h"
 
 /* TODO (at least...):