From 47fc2c4349746997704a7f81dffadd22363e0ff1 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Fri, 10 Aug 2007 15:31:26 +0100
Subject: Lift common winsys functions into pipe's new p_winsys.

---
 src/mesa/pipe/i915simple/i915_debug.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/mesa/pipe/i915simple/i915_debug.h')

diff --git a/src/mesa/pipe/i915simple/i915_debug.h b/src/mesa/pipe/i915simple/i915_debug.h
index f0f72780d3e..0ea131171ef 100644
--- a/src/mesa/pipe/i915simple/i915_debug.h
+++ b/src/mesa/pipe/i915simple/i915_debug.h
@@ -39,7 +39,7 @@ struct debug_stream
    char *ptr;		/* pointer to gtt offset zero */
    char *end;		/* pointer to gtt offset zero */
    unsigned print_addresses;
-   struct i915_winsys *winsys;
+   struct pipe_winsys *winsys;
 };
 
 
@@ -68,9 +68,11 @@ void i915_print_ureg(const char *msg, unsigned ureg);
 #define DEBUG_WINSYS     0x4000
 
 #ifdef DEBUG
-#include "i915_winsys.h"
-#define DBG( i915, ... ) \
-   if ((i915)->debug & FILE_DEBUG_FLAG) (i915)->winsys->printf( (i915)->winsys, __VA_ARGS__ )
+#include "pipe/p_winsys.h"
+#define DBG( i915, ... ) do {						\
+   if ((i915)->debug & FILE_DEBUG_FLAG) 				\
+      (i915)->pipe.winsys->printf( (i915)->pipe.winsys, __VA_ARGS__ );	\
+} while(0)
 #else
 #define DBG( i915, ... ) \
    (void)i915
-- 
cgit v1.2.3