r300g: fix flushing harder.

I swear ipers runs here after this commit.

After we flush we need to redo the space check
This commit is contained in:
Dave Airlie 2010-01-24 14:58:45 +10:00
parent 28c3e57c83
commit 232ddfec24
2 changed files with 4 additions and 3 deletions

View file

@ -1105,9 +1105,10 @@ void r300_emit_dirty_state(struct r300_context* r300)
/* Make sure we have at least 2*1024 spare dwords. */
/* XXX It would be nice to know the number of dwords we really need to
* XXX emit. */
again:
if (!r300->winsys->check_cs(r300->winsys, dwords)) {
r300->context.flush(&r300->context, 0, NULL);
r300_emit_buffer_validate(r300);
goto again;
}
if (r300->dirty_state & R300_NEW_QUERY) {

View file

@ -302,6 +302,8 @@ void r300_draw_range_elements(struct pipe_context* pipe,
r300_update_derived_state(r300);
r300_emit_buffer_validate(r300);
if (!r300_setup_vertex_buffers(r300)) {
return;
}
@ -311,8 +313,6 @@ void r300_draw_range_elements(struct pipe_context* pipe,
indexSize = 2;
}
r300_emit_buffer_validate(r300);
if (!r300->winsys->add_buffer(r300->winsys, indexBuffer,
RADEON_GEM_DOMAIN_GTT, 0)) {
goto cleanup;