1 files changed, 137 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i915-tex/intel_batchbuffer.h b/src/mesa/drivers/dri/i915-tex/intel_batchbuffer.h
new file mode 100644
index 00000000000..322ec944190
--- /dev/null
+++ b/src/mesa/drivers/dri/i915-tex/intel_batchbuffer.h
@@ -0,0 +1,137 @@
+#ifndef INTEL_BATCHBUFFER_H
+#define INTEL_BATCHBUFFER_H
+
+#include "mtypes.h"
+#include "intel_bufmgr.h"
+
+struct intel_context;
+
+#define BATCH_SZ 4096
+#define BATCH_RESERVED 16
+
+#define MAX_RELOCS 100
+
+#define INTEL_BATCH_NO_CLIPRECTS 0x1
+#define INTEL_BATCH_CLIPRECTS    0x2
+
+struct buffer_reloc {
+   GLuint offset;
+   GLuint elem;			/* elem in buffer list, not buffer id */
+   GLuint delta;		/* not needed? */
+};
+
+struct intel_batchbuffer {
+   struct bufmgr *bm;
+   struct intel_context *intel;
+
+   GLuint buffer;
+   GLuint last_fence;
+   GLuint flags;
+
+   /* In progress:
+    */
+   unsigned long offset[MAX_RELOCS];
+   struct _drmMMBufList *list;   
+   GLuint list_count;
+   GLubyte *map;
+   GLubyte *ptr; 
+
+   struct buffer_reloc reloc[MAX_RELOCS];
+   GLuint nr_relocs;
+};
+
+struct intel_batchbuffer *intel_batchbuffer_alloc( struct intel_context *intel );
+
+void intel_batchbuffer_free( struct intel_batchbuffer *batch );
+
+
+<<<<<<< intel_batchbuffer.h
+#define BEGIN_BATCH(n)							\
+do {									\
+   if (VERBOSE) fprintf(stderr, 					\
+			"BEGIN_BATCH(%d) in %s, %d dwords free\n",	\
+			(n), __FUNCTION__, intel->batch.space/4);	\
+   if (intel->batch.space < (n)*4)					\
+      intelFlushBatch(intel, GL_TRUE);					\
+   if (intel->batch.space == intel->batch.size)	intel->batch.func = __FUNCTION__;			\
+   batch_ptr = intel->batch.ptr;					\
+} while (0)
+=======
+void intel_batchbuffer_finish( struct intel_batchbuffer *batch );
+>>>>>>> 1.2.12.12
+
+GLuint intel_batchbuffer_flush( struct intel_batchbuffer *batch );
+
+
+/* Unlike bmBufferData, this currently requires the buffer be mapped.
+ * Consider it a convenience function wrapping multple
+ * intel_buffer_dword() calls.
+ */
+void intel_batchbuffer_data(struct intel_batchbuffer *batch,
+			    const void *data,
+			    GLuint bytes,
+			    GLuint flags);
+
+void intel_batchbuffer_release_space(struct intel_batchbuffer *batch,
+				   GLuint bytes);
+
+GLboolean intel_batchbuffer_emit_reloc( struct intel_batchbuffer *batch,
+					GLuint buffer,
+					GLuint flags,
+					GLuint offset );
+
+/* Inline functions - might actually be better off with these
+ * non-inlined.  Certainly better off switching all command packets to
+ * be passed as structs rather than dwords, but that's a little bit of
+ * work...
+ */
+static INLINE GLuint 
+intel_batchbuffer_space( struct intel_batchbuffer *batch )
+{
+   return (BATCH_SZ - BATCH_RESERVED) - (batch->ptr - batch->map);
+}
+
+
+static INLINE void 
+intel_batchbuffer_emit_dword(struct intel_batchbuffer *batch,
+			     GLuint dword)
+{
+   assert(batch->map);
+   assert(intel_batchbuffer_space(batch) >= 4);
+   *(GLuint *)(batch->ptr) = dword;
+   batch->ptr += 4;
+}
+
+static INLINE void 
+intel_batchbuffer_require_space(struct intel_batchbuffer *batch,
+				GLuint sz,
+				GLuint flags)
+{
+   assert(sz < BATCH_SZ - 8);
+   if (intel_batchbuffer_space(batch) < sz ||
+       (batch->flags != 0 && flags != 0 && batch->flags != flags))
+      intel_batchbuffer_flush(batch);
+   
+   batch->flags |= flags;
+}
+
+/* Here are the crusty old macros, to be removed:
+ */
+#define BATCH_LOCALS 
+
+#define BEGIN_BATCH(n, flags) do {				\
+   assert(!intel->prim.flush);					\
+   intel_batchbuffer_require_space(intel->batch, (n)*4, flags);	\
+} while (0)
+
+#define OUT_BATCH(d)  intel_batchbuffer_emit_dword(intel->batch, d)
+
+#define OUT_RELOC(buf,flags,delta) do { 				\
+   assert((delta) >= 0);							\
+   intel_batchbuffer_emit_reloc(intel->batch, buf, flags, delta);	\
+} while (0)
+
+#define ADVANCE_BATCH() do { } while(0)
+
+
+#endif