i965g: pull in a copy of intel_decode.c for now

With the stubbed out, non-hardware xlib winsys, trivial/clear runs and
prints a plausible command stream

1 files changed, 10 insertions, 8 deletions

diff --git a/src/gallium/drivers/i965/brw_batchbuffer.c b/src/gallium/drivers/i965/brw_batchbuffer.c
index bfb7175f75..64d6754df5 100644
--- a/src/gallium/drivers/i965/brw_batchbuffer.c
+++ b/src/gallium/drivers/i965/brw_batchbuffer.c
@@ -35,6 +35,7 @@
 #include "brw_winsys.h"
 #include "brw_debug.h"
 #include "brw_structs.h"
+#include "intel_decode.h"
 
 #define USE_MALLOC_BUFFER 1
 #define ALWAYS_EMIT_MI_FLUSH 1
@@ -47,9 +48,6 @@ brw_batchbuffer_reset(struct brw_batchbuffer *batch)
       batch->buf = NULL;
    }
 
-   if (batch->use_malloc_buffer && !batch->malloc_buffer)
-      batch->malloc_buffer = MALLOC(BRW_BATCH_SIZE);
-
    batch->buf = batch->sws->bo_alloc(batch->sws,
 				     BRW_BUFFER_TYPE_BATCH,
 				     BRW_BATCH_SIZE, 4096);
@@ -64,12 +62,18 @@ brw_batchbuffer_reset(struct brw_batchbuffer *batch)
 }
 
 struct brw_batchbuffer *
-brw_batchbuffer_alloc(struct brw_winsys_screen *sws)
+brw_batchbuffer_alloc(struct brw_winsys_screen *sws,
+                      struct brw_chipset chipset)
 {
    struct brw_batchbuffer *batch = CALLOC_STRUCT(brw_batchbuffer);
 
    batch->use_malloc_buffer = USE_MALLOC_BUFFER;
+   if (batch->use_malloc_buffer) {
+      batch->malloc_buffer = MALLOC(BRW_BATCH_SIZE);
+   }
+
    batch->sws = sws;
+   batch->chipset = chipset;
    brw_batchbuffer_reset(batch);
 
    return batch;
@@ -142,18 +146,16 @@ _brw_batchbuffer_flush(struct brw_batchbuffer *batch,
       
    batch->sws->bo_exec(batch->buf, used );
 
-#if 0      
-   if (BRW_DEBUG & DEBUG_BATCH) {
+   if (1 /*BRW_DEBUG & DEBUG_BATCH*/) {
       void *ptr = batch->sws->bo_map(batch->buf, GL_FALSE);
 
       intel_decode(ptr,
 		   used / 4, 
-		   batch->buf->offset,
+		   batch->buf->offset[0],
 		   batch->chipset.pci_id);
 
       batch->sws->bo_unmap(batch->buf);
    }
-#endif
 
    if (BRW_DEBUG & DEBUG_SYNC) {
       /* Abuse map/unmap to achieve wait-for-fence.