Move driBatchPoolInit() into new intel_batchpool.h header.

Note that intel_batchpool.[ch] have no intel-specific dependencies at this poi
Maybe rename files for re-use in the future.

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_batchpool.c b/src/mesa/drivers/dri/intel_winsys/intel_batchpool.c
index 2503b8a..a81a463 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_batchpool.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_batchpool.c
@@ -29,6 +29,11 @@
  * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com>
  */
 
+/**
+ * XXX NOTE: there are no intel dependencies in this file.
+ * Rename to dri_batchpool.c?
+ */
+
 #include <xf86drm.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -36,7 +41,8 @@
 #include "glthread.h"
 #include "dri_bufpool.h"
 #include "dri_bufmgr.h"
-#include "intel_screen.h"
+#include "intel_batchpool.h"
+
 
 typedef struct
 {

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_screen.c b/src/mesa/drivers/dri/intel_winsys/intel_screen.c
index feaeb18..c14e84e 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_screen.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_screen.c
@@ -32,6 +32,7 @@
 #include "intel_context.h"
 #include "intel_screen.h"
 #include "intel_batchbuffer.h"
+#include "intel_batchpool.h"
 #include "intel_swapbuffers.h"
 
 #include "i830_dri.h"

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_screen.h b/src/mesa/drivers/dri/intel_winsys/intel_screen.h
index b0d1e8e..87a6cb2 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_screen.h
+++ b/src/mesa/drivers/dri/intel_winsys/intel_screen.h
@@ -95,10 +95,6 @@ intelMakeCurrent(__DRIcontextPrivate * driContextPriv,
                  __DRIdrawablePrivate * driDrawPriv,
                  __DRIdrawablePrivate * driReadPriv);
 
-extern struct _DriBufferPool *driBatchPoolInit(int fd, unsigned flags,
-                                               unsigned long bufSize,
-                                               unsigned numBufs,
-                                               unsigned checkDelayed);
 
 extern GLboolean
 intelCreatePools(__DRIscreenPrivate *sPriv);