#include "draw/draw_context.h"
#include "draw/draw_private.h"
-#include "util/u_simple_list.h"
+#include "util/simple_list.h"
+#include "util/u_upload_mgr.h"
+
+#include "os/os_time.h"
#include "r300_context.h"
#include "r300_cs.h"
#include "r300_emit.h"
-#include "r300_flush.h"
-static void r300_flush(struct pipe_context* pipe,
- unsigned flags,
- struct pipe_fence_handle** fence)
+
+static void r300_flush_and_cleanup(struct r300_context *r300, unsigned flags,
+ struct pipe_fence_handle **fence)
{
- struct r300_context *r300 = r300_context(pipe);
- struct r300_query *query;
struct r300_atom *atom;
- struct pipe_framebuffer_state *fb;
- unsigned i;
-
- CS_LOCALS(r300);
- (void) cs_count;
- /* We probably need to flush Draw, but we may have been called from
- * within Draw. This feels kludgy, but it might be the best thing.
- *
- * Of course, the best thing is to kill Draw with fire. :3 */
- if (r300->draw && !r300->draw->flushing) {
- draw_flush(r300->draw);
- }
- if (r300->dirty_hw) {
- r300_emit_query_end(r300);
+ r300_emit_hyperz_end(r300);
+ r300_emit_query_end(r300);
+ if (r300->screen->caps.is_r500)
+ r500_emit_index_bias(r300, 0);
- FLUSH_CS;
- r300->dirty_hw = 0;
+ /* The DDX doesn't set these regs. */
+ {
+ CS_LOCALS(r300);
+ OUT_CS_REG_SEQ(R300_GB_MSPOS0, 2);
+ OUT_CS(0x66666666);
+ OUT_CS(0x6666666);
+ }
- /* New kitchen sink, baby. */
- foreach(atom, &r300->atom_list) {
- if (atom->state || atom->allow_null_state) {
- atom->dirty = TRUE;
- }
- }
+ r300->flush_counter++;
+ r300->rws->cs_flush(r300->cs, flags, fence);
+ r300->dirty_hw = 0;
- /* Unmark HWTCL state for SWTCL. */
- if (!r300->screen->caps.has_tcl) {
- r300->vs_state.dirty = FALSE;
- r300->vs_constants.dirty = FALSE;
+ /* New kitchen sink, baby. */
+ foreach_atom(r300, atom) {
+ if (atom->state || atom->allow_null_state) {
+ r300_mark_atom_dirty(r300, atom);
}
}
+ r300->vertex_arrays_dirty = TRUE;
- /* reset flushed query */
- foreach(query, &r300->query_list) {
- query->flushed = TRUE;
+ /* Unmark HWTCL state for SWTCL. */
+ if (!r300->screen->caps.has_tcl) {
+ r300->vs_state.dirty = FALSE;
+ r300->vs_constants.dirty = FALSE;
+ r300->clip_state.dirty = FALSE;
}
+}
- /* XXX
- *
- * This is a preliminary implementation of glFinish. Note that st/mesa
- * uses a non-null fence when glFinish is called and then waits for
- * the fence. Instead of returning the actual fence, we do the sync
- * directly.
- *
- * The ideal implementation should use something like EmitIrqLocked and
- * WaitIrq, or better, real fences.
- *
- * This feature degrades performance to the level of r300c for games that
- * use glFinish a lot, even openarena does. Ideally we wouldn't need
- * glFinish at all if we had proper throttling in swapbuffers so that
- * the CPU wouldn't outrun the GPU by several frames, so this is basically
- * a temporary fix for the input lag. Once swap&sync works with DRI2,
- * I'll be happy to remove this code.
- *
- * - M. */
- if (fence && r300->fb_state.state) {
- fb = r300->fb_state.state;
-
- for (i = 0; i < fb->nr_cbufs; i++) {
- if (fb->cbufs[i]->texture) {
- r300->rws->buffer_wait(r300->rws,
- r300_texture(fb->cbufs[i]->texture)->buffer);
- }
- if (fb->zsbuf) {
- r300->rws->buffer_wait(r300->rws,
- r300_texture(fb->zsbuf->texture)->buffer);
+void r300_flush(struct pipe_context *pipe,
+ unsigned flags,
+ struct pipe_fence_handle **fence)
+{
+ struct r300_context *r300 = r300_context(pipe);
+
+ if (r300->dirty_hw) {
+ r300_flush_and_cleanup(r300, flags, fence);
+ } else {
+ if (fence) {
+ /* We have to create a fence object, but the command stream is empty
+ * and we cannot emit an empty CS. Let's write to some reg. */
+ CS_LOCALS(r300);
+ OUT_CS_REG(RB3D_COLOR_CHANNEL_MASK, 0);
+ r300->rws->cs_flush(r300->cs, flags, fence);
+ } else {
+ /* Even if hw is not dirty, we should at least reset the CS in case
+ * the space checking failed for the first draw operation. */
+ r300->rws->cs_flush(r300->cs, flags, NULL);
+ }
+ }
+
+ /* Update Hyper-Z status. */
+ if (r300->hyperz_enabled) {
+ /* If there was a Z clear, keep Hyper-Z access. */
+ if (r300->num_z_clears) {
+ r300->hyperz_time_of_last_flush = os_time_get();
+ r300->num_z_clears = 0;
+ } else if (r300->hyperz_time_of_last_flush - os_time_get() > 2000000) {
+ /* If there hasn't been a Z clear for 2 seconds, revoke Hyper-Z access. */
+ r300->hiz_in_use = FALSE;
+
+ /* Decompress the Z buffer. */
+ if (r300->zmask_in_use) {
+ if (r300->locked_zbuffer) {
+ r300_decompress_zmask_locked(r300);
+ } else {
+ r300_decompress_zmask(r300);
+ }
+
+ if (fence && *fence)
+ r300->rws->fence_reference(fence, NULL);
+ r300_flush_and_cleanup(r300, flags, fence);
}
+
+ /* Revoke Hyper-Z access, so that some other process can take it. */
+ r300->rws->cs_request_feature(r300->cs, RADEON_FID_R300_HYPERZ_ACCESS,
+ FALSE);
+ r300->hyperz_enabled = FALSE;
}
}
}
+static void r300_flush_wrapped(struct pipe_context *pipe,
+ struct pipe_fence_handle **fence,
+ unsigned flags)
+{
+ r300_flush(pipe,
+ flags & PIPE_FLUSH_END_OF_FRAME ? RADEON_FLUSH_END_OF_FRAME : 0,
+ fence);
+}
+
void r300_init_flush_functions(struct r300_context* r300)
{
- r300->context.flush = r300_flush;
+ r300->context.flush = r300_flush_wrapped;
}
projects / mesa.git / blobdiff