Mesa (gallium-0.2): i915: Don't take a context as argument for debug

[Jakob Bornecrantz]

Module: Mesa
Branch: gallium-0.2
Commit: 8340a116ea346ee7f11fe150a1439e1d7bd86118
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8340a116ea346ee7f11fe150a1439e1d7bd86118

Author: Jakob Bornecrantz <wallbraker at gmail.com>
Date:   Thu Jan 29 01:29:26 2009 +0100

i915: Don't take a context as argument for debug

---

 src/gallium/drivers/i915simple/i915_debug.c |    7 +++----
 src/gallium/drivers/i915simple/i915_debug.h |    5 ++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/i915simple/i915_debug.c b/src/gallium/drivers/i915simple/i915_debug.c
index 548b60d..4adf9de 100644
--- a/src/gallium/drivers/i915simple/i915_debug.c
+++ b/src/gallium/drivers/i915simple/i915_debug.c
@@ -864,18 +864,17 @@ static boolean i915_debug_packet( struct debug_stream *stream )
 
 
 void
-i915_dump_batchbuffer( struct i915_context *i915 )
+i915_dump_batchbuffer( struct i915_batchbuffer *batch )
 {
    struct debug_stream stream;
-   unsigned *start = (unsigned*)i915->batch->map;
-   unsigned *end = (unsigned*)i915->batch->ptr;
+   unsigned *start = (unsigned*)batch->map;
+   unsigned *end = (unsigned*)batch->ptr;
    unsigned long bytes = (unsigned long) (end - start) * 4;
    boolean done = FALSE;
 
    stream.offset = 0;
    stream.ptr = (char *)start;
    stream.print_addresses = 0;
-   stream.winsys = i915->pipe.winsys;
 
    if (!start || !end) {
       debug_printf( "\n\nBATCH: ???\n");
diff --git a/src/gallium/drivers/i915simple/i915_debug.h b/src/gallium/drivers/i915simple/i915_debug.h
index afb63ed..c33ee36 100644
--- a/src/gallium/drivers/i915simple/i915_debug.h
+++ b/src/gallium/drivers/i915simple/i915_debug.h
@@ -41,7 +41,6 @@ struct debug_stream
    char *ptr;		/* pointer to gtt offset zero */
    char *end;		/* pointer to gtt offset zero */
    unsigned print_addresses;
-   struct pipe_winsys *winsys;
 };
 
 
@@ -105,9 +104,9 @@ I915_DBG(
 #endif
 
 
-void i915_dump_batchbuffer( struct i915_context *i915 );
-
+struct i915_batchbuffer;
 
+void i915_dump_batchbuffer( struct i915_batchbuffer *i915 );
 
 void i915_debug_init( struct i915_context *i915 );