Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1

2 files changed, 2 insertions, 2 deletions

diff --git a/src/gallium/auxiliary/draw/draw_pt.c b/src/gallium/auxiliary/draw/draw_pt.c
index 9140faeea9d..85a75525c8b 100644
--- a/src/gallium/auxiliary/draw/draw_pt.c
+++ b/src/gallium/auxiliary/draw/draw_pt.c
@@ -37,6 +37,8 @@
 
 static unsigned trim( unsigned count, unsigned first, unsigned incr )
 {
+   if (count < first)
+      return 0;
    return count - (count - first) % incr; 
 }
 
diff --git a/src/gallium/auxiliary/draw/draw_vs_aos_io.c b/src/gallium/auxiliary/draw/draw_vs_aos_io.c
index 6b928118707..8e834501a4c 100644
--- a/src/gallium/auxiliary/draw/draw_vs_aos_io.c
+++ b/src/gallium/auxiliary/draw/draw_vs_aos_io.c
@@ -184,7 +184,6 @@ boolean aos_fetch_inputs( struct aos_compilation *cp, boolean linear )
       if (!load_input( cp, i, linear ))
          return FALSE;
       cp->insn_counter++;
-      debug_printf("\n");
    }
 
    return TRUE;
@@ -316,7 +315,6 @@ boolean aos_emit_outputs( struct aos_compilation *cp )
       aos_release_xmm_reg( cp, data.idx );
 
       cp->insn_counter++;
-      debug_printf("\n");
    }
 
    return TRUE;