gallium: make p_winsys internal

[mesa.git] / src / gallium / drivers / i915simple / i915_debug_fp.c

diff --git a/src/gallium/drivers/i915simple/i915_debug_fp.c b/src/gallium/drivers/i915simple/i915_debug_fp.c
index ebfdb3d93c5c0217ee59f45e3fba21f1dd4b20cc..9c5b117b6dd47ae12157edc26f6db8c56bcbb42c 100644 (file)
--- a/src/gallium/drivers/i915simple/i915_debug_fp.c
+++ b/src/gallium/drivers/i915simple/i915_debug_fp.c
@@ -28,8 +28,8 @@
 
 #include "i915_reg.h"
 #include "i915_debug.h"
-#include "pipe/p_winsys.h"
-#include "pipe/p_util.h"
+#include "pipe/internal/p_winsys_screen.h"
+#include "util/u_memory.h"
 
 
 static void
@@ -39,11 +39,9 @@ PRINTF(
                         ... )
 {
    va_list  args;
-   char     buffer[256];
 
    va_start( args, fmt );
-   vsprintf( buffer, fmt, args );
-   stream->winsys->printf( stream->winsys, buffer );
+   debug_vprintf( fmt, args );
    va_end( args );
 }
 
@@ -335,12 +333,11 @@ void
 i915_disassemble_program(struct debug_stream *stream, 
                         const unsigned * program, unsigned sz)
 {
-   unsigned size = program[0] & 0x1ff;
    unsigned i;
 
    PRINTF(stream, "\t\tBEGIN\n");
 
-   assert(size + 2 == sz);
+   assert((program[0] & 0x1ff) + 2 == sz);
 
    program++;
    for (i = 1; i < sz; i += 3, program += 3) {