r300g/swtcl: unlock VBO after draw_flush

https://bugs.freedesktop.org/show_bug.cgi?id=29901
https://bugs.freedesktop.org/show_bug.cgi?id=30132

diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c
index 6c4cd6c59bdc4a26fd823fb198d5ab4168e9190a..177850dea2f56f0a55eab9f4439531acac5b5959 100644 (file)
--- a/src/gallium/drivers/r300/r300_render.c
+++ b/src/gallium/drivers/r300/r300_render.c
@@ -754,11 +754,8 @@ static void r300_swtcl_draw_vbo(struct pipe_context* pipe,
 
     r300->draw_vbo_locked = TRUE;
     draw_vbo(r300->draw, info);
-    r300->draw_vbo_locked = FALSE;
-
-    /* XXX Not sure whether this is the best fix.
-     * It prevents CS from being rejected and weird assertion failures. */
     draw_flush(r300->draw);
+    r300->draw_vbo_locked = FALSE;
 
     for (i = 0; i < r300->vertex_buffer_count; i++) {
         if (r300->vertex_buffer[i].buffer) {