Skip to content
Snippets Groups Projects
Commit 9ca4c8f6 authored by Paul Berry's avatar Paul Berry Committed by Carl Worth
Browse files

i965: Ensure that all necessary state is re-emitted if we run out of aperture.


Prior to this patch, if we ran out of aperture space during
brw_try_draw_prims(), we would rewind the batch buffer pointer
(potentially throwing some state that may have been emitted by
brw_upload_state()), flush the batch, and then try again.  However, we
wouldn't reset the dirty bits to the state they had before the call to
brw_upload_state().  As a result, when we tried again, there was a
danger that we wouldn't re-emit all the necessary state.  (Note: prior
to the introduction of hardware contexts, this wasn't a problem
because flushing the batch forced all state to be re-emitted).

This patch fixes the problem by leaving the dirty bits set at the end
of brw_upload_state(); we only clear them after we have determined
that we don't need to rewind the batch buffer.

Cc: 10.0 9.2 <mesa-stable@lists.freedesktop.org>

Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke's avatarKenneth Graunke <kenneth@whitecape.org>
(cherry picked from commit fb6d9798)
parent 502d89b2
No related branches found
No related tags found
No related merge requests found
......@@ -445,6 +445,12 @@ retry:
}
}
}
/* Now that we know we haven't run out of aperture space, we can safely
* reset the dirty bits.
*/
if (brw->state.dirty.brw)
brw_clear_dirty_bits(brw);
}
if (brw->always_flush_batch)
......
......@@ -143,6 +143,7 @@ brw_depthbuffer_format(struct brw_context *brw);
* brw_state.c
*/
void brw_upload_state(struct brw_context *brw);
void brw_clear_dirty_bits(struct brw_context *brw);
void brw_init_state(struct brw_context *brw);
void brw_destroy_state(struct brw_context *brw);
......
......@@ -573,6 +573,20 @@ void brw_upload_state(struct brw_context *brw)
fprintf(stderr, "\n");
}
}
}
/**
* Clear dirty bits to account for the fact that the state emitted by
* brw_upload_state() has been committed to the hardware. This is a separate
* call from brw_upload_state() because it's possible that after the call to
* brw_upload_state(), we will discover that we've run out of aperture space,
* and need to rewind the batch buffer to the state it had before the
* brw_upload_state() call.
*/
void
brw_clear_dirty_bits(struct brw_context *brw)
{
struct brw_state_flags *state = &brw->state.dirty;
memset(state, 0, sizeof(*state));
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment