r300g: clean up some mess in set_constant_buffer

[mesa.git] / src / gallium / drivers / r300 / r300_flush.c

diff --git a/src/gallium/drivers/r300/r300_flush.c b/src/gallium/drivers/r300/r300_flush.c
index 7fed9b5d07478cb105d0cdf7ce1b4ef583160449..2b5d2e42ba5bb6ff9079998583655371b7898005 100644 (file)
--- a/src/gallium/drivers/r300/r300_flush.c
+++ b/src/gallium/drivers/r300/r300_flush.c
@@ -43,10 +43,14 @@ static void r300_flush(struct pipe_context* pipe,
     u_upload_flush(r300->upload_vb);
     u_upload_flush(r300->upload_ib);
 
+    if (r300->draw)
+       r300_draw_flush_vbuf(r300);
+
     if (r300->dirty_hw) {
-        if (r300->rws->get_value(r300->rws, R300_CAN_HYPERZ))
-            r300_emit_hyperz_end(r300);
+        r300_emit_hyperz_end(r300);
         r300_emit_query_end(r300);
+        if (r500_index_bias_supported(r300))
+            r500_emit_index_bias(r300, 0);
 
         r300->flush_counter++;
         r300->rws->cs_flush(r300->cs);