From d31b928b93694de0a1408f36acb675485fea5973 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Thu, 26 Sep 2013 12:03:41 -0700 Subject: [PATCH] i965: Remove the brw_context::emit_state_always flag. This was always set to false, and is only used for debugging. To enable it, simply change the if (0) block and recompile. Signed-off-by: Kenneth Graunke Reviewed-by: Ian Romanick --- src/mesa/drivers/dri/i965/brw_context.c | 2 -- src/mesa/drivers/dri/i965/brw_context.h | 2 -- src/mesa/drivers/dri/i965/brw_state_upload.c | 3 ++- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 04045a584a5..3ddc1814e3b 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -475,8 +475,6 @@ brwCreateContext(gl_api api, */ STATIC_ASSERT(BRW_NUM_STATE_BITS <= 8 * sizeof(brw->state.dirty.brw)); - brw->emit_state_always = 0; - brw->batch.need_workaround_flush = true; ctx->VertexProgram._MaintainTnlProgram = true; diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 28ae261a68a..0c6482d2a27 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -1040,8 +1040,6 @@ struct brw_context uint32_t max_gtt_map_object_size; - bool emit_state_always; - int gen; int gt; diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c index d7fe3193bb1..60c8b5e2b87 100644 --- a/src/mesa/drivers/dri/i965/brw_state_upload.c +++ b/src/mesa/drivers/dri/i965/brw_state_upload.c @@ -471,7 +471,8 @@ void brw_upload_state(struct brw_context *brw) state->brw |= ctx->NewDriverState; ctx->NewDriverState = 0; - if (brw->emit_state_always) { + if (0) { + /* Always re-emit all state. */ state->mesa |= ~0; state->brw |= ~0; state->cache |= ~0; -- 2.30.2