aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2010-09-13 21:08:48 +0200
committerMarek Olšák <[email protected]>2010-09-13 21:12:07 +0200
commit428dc6d7d2cf6a5da37a2ea7ce436cf521b009a2 (patch)
tree56fdd91338a05be7bc68dfbf8ec3361fe74b1439 /src
parentc40858fa0dac28dc5096973ac267630ba5725003 (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/r300/r300_render.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c
index 6c4cd6c59bd..177850dea2f 100644
--- 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) {