r600g: update R600_MAX_DRAW_CS_DWORDS to take draw-opaque into account

diff --git a/src/gallium/drivers/r600/r600_hw_context_priv.h b/src/gallium/drivers/r600/r600_hw_context_priv.h
index 81a998d..8d0ebc9 100644 (file)
--- a/src/gallium/drivers/r600/r600_hw_context_priv.h
+++ b/src/gallium/drivers/r600/r600_hw_context_priv.h
@@ -28,7 +28,7 @@
 
 #include "r600_pipe.h"
 
-#define R600_MAX_DRAW_CS_DWORDS 11
+#define R600_MAX_DRAW_CS_DWORDS 16
 
 /* these flags are used in register flags and added into block flags */
 #define REG_FLAG_NEED_BO 1

diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
index 05152ca..2c95878 100644 (file)
--- a/src/gallium/drivers/r600/r600_state_common.c
+++ b/src/gallium/drivers/r600/r600_state_common.c
@@ -1070,9 +1070,7 @@ void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *dinfo)
        r600_context_pipe_state_set(rctx, &rctx->vgt);
 
        /* Emit states (the function expects that we emit at most 17 dwords here). */
-       r600_need_cs_space(rctx,
-                          !info.indexed && info.count_from_stream_output ? 14 : 0,
-                          TRUE);
+       r600_need_cs_space(rctx, 0, TRUE);
 
        LIST_FOR_EACH_ENTRY_SAFE(state, next_state, &rctx->dirty_states, head) {
                r600_emit_atom(rctx, state);