From: Brian Paul <brianp@vmware.com>
Date: Tue, 3 Aug 2010 20:12:47 +0000 (-0600)
Subject: draw: add assertion, rearrange debug code
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f94e7e25d101a8691a5276a5aa0eb97d2f4eebbc;p=mesa.git

draw: add assertion, rearrange debug code
---

diff --git a/src/gallium/auxiliary/draw/draw_pt.c b/src/gallium/auxiliary/draw/draw_pt.c
index adef26a1678..0a413286425 100644
--- a/src/gallium/auxiliary/draw/draw_pt.c
+++ b/src/gallium/auxiliary/draw/draw_pt.c
@@ -342,19 +342,22 @@ draw_arrays_instanced(struct draw_context *draw,
    unsigned reduced_prim = u_reduced_prim(mode);
    unsigned instance;
 
+   assert(instanceCount > 0);
+
    if (reduced_prim != draw->reduced_prim) {
       draw_do_flush(draw, DRAW_FLUSH_STATE_CHANGE);
       draw->reduced_prim = reduced_prim;
    }
 
    if (0)
-      draw_print_arrays(draw, mode, start, MIN2(count, 20));
-
-   if (0) {
-      unsigned int i;
       debug_printf("draw_arrays(mode=%u start=%u count=%u):\n",
                    mode, start, count);
+
+   if (0)
       tgsi_dump(draw->vs.vertex_shader->state.tokens, 0);
+
+   if (0) {
+      unsigned int i;
       debug_printf("Elements:\n");
       for (i = 0; i < draw->pt.nr_vertex_elements; i++) {
          debug_printf("  %u: src_offset=%u  inst_div=%u   vbuf=%u  format=%s\n",
@@ -375,6 +378,9 @@ draw_arrays_instanced(struct draw_context *draw,
       }
    }
 
+   if (0)
+      draw_print_arrays(draw, mode, start, MIN2(count, 20));
+
    for (instance = 0; instance < instanceCount; instance++) {
       draw->instance_id = instance + startInstance;
       draw_pt_arrays(draw, mode, start, count);