diff options
| author | Rob Clark <[email protected]> | 2017-04-16 12:21:49 -0400 |
|---|---|---|
| committer | Rob Clark <[email protected]> | 2017-04-18 16:32:00 -0400 |
| commit | 71f9e03d211a17e7c53de595966d4c0ed41a97f1 (patch) | |
| tree | a83f9b25f28f7653a8db212bf9c898bc291c3672 | |
| parent | 248a508f243a0fb6ef92d3048e60a278a4326ddd (diff) | |
freedreno: add helper to mark all state dirty
This will simplify things when we break out per-shader-stage dirty bits.
Signed-off-by: Rob Clark <[email protected]>
4 files changed, 13 insertions, 6 deletions
diff --git a/src/gallium/drivers/freedreno/freedreno_batch.c b/src/gallium/drivers/freedreno/freedreno_batch.c index 5cd6a697e13..f97282b3405 100644 --- a/src/gallium/drivers/freedreno/freedreno_batch.c +++ b/src/gallium/drivers/freedreno/freedreno_batch.c @@ -264,7 +264,7 @@ batch_flush(struct fd_batch *batch) */ fd_hw_query_set_stage(batch, batch->draw, FD_STAGE_NULL); - batch->ctx->dirty = ~0; + fd_context_all_dirty(batch->ctx); batch_flush_reset_dependencies(batch, true); if (batch->ctx->screen->reorder) { diff --git a/src/gallium/drivers/freedreno/freedreno_context.h b/src/gallium/drivers/freedreno/freedreno_context.h index 67291a097cc..9db34ef8a03 100644 --- a/src/gallium/drivers/freedreno/freedreno_context.h +++ b/src/gallium/drivers/freedreno/freedreno_context.h @@ -325,6 +325,13 @@ fd_context_unlock(struct fd_context *ctx) mtx_unlock(&ctx->screen->lock); } +/* mark all state dirty: */ +static inline void +fd_context_all_dirty(struct fd_context *ctx) +{ + ctx->dirty = ~0; +} + static inline struct pipe_scissor_state * fd_context_get_scissor(struct fd_context *ctx) { diff --git a/src/gallium/drivers/freedreno/freedreno_draw.c b/src/gallium/drivers/freedreno/freedreno_draw.c index 22d20c489c5..f911d4a6095 100644 --- a/src/gallium/drivers/freedreno/freedreno_draw.c +++ b/src/gallium/drivers/freedreno/freedreno_draw.c @@ -95,7 +95,7 @@ fd_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info) if (ctx->in_blit) { fd_batch_reset(batch); - ctx->dirty = ~0; + fd_context_all_dirty(ctx); } batch->blit = ctx->in_blit; @@ -207,7 +207,7 @@ fd_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info) ctx->streamout.offsets[i] += info->count; if (fd_mesa_debug & FD_DBG_DDRAW) - ctx->dirty = 0xffffffff; + fd_context_all_dirty(ctx); fd_batch_check_size(batch); @@ -307,7 +307,7 @@ fd_clear(struct pipe_context *pctx, unsigned buffers, if (ctx->in_blit) { fd_batch_reset(batch); - ctx->dirty = ~0; + fd_context_all_dirty(ctx); } /* for bookkeeping about which buffers have been cleared (and thus @@ -377,7 +377,7 @@ fd_clear(struct pipe_context *pctx, unsigned buffers, FD_DIRTY_FRAMEBUFFER; if (fd_mesa_debug & FD_DBG_DCLEAR) - ctx->dirty = 0xffffffff; + fd_context_all_dirty(ctx); } static void diff --git a/src/gallium/drivers/freedreno/freedreno_state.c b/src/gallium/drivers/freedreno/freedreno_state.c index 804d2b78624..06dfd228dcc 100644 --- a/src/gallium/drivers/freedreno/freedreno_state.c +++ b/src/gallium/drivers/freedreno/freedreno_state.c @@ -131,7 +131,7 @@ fd_set_framebuffer_state(struct pipe_context *pctx, fd_batch_reference(&ctx->batch, NULL); fd_reset_wfi(batch); ctx->batch = batch; - ctx->dirty = ~0; + fd_context_all_dirty(ctx); if (old_batch && old_batch->blit && !old_batch->back_blit) { /* for blits, there is not really much point in hanging on |