summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2013-09-26 12:03:41 -0700
committerKenneth Graunke <kenneth@whitecape.org>2013-10-13 00:10:44 -0700
commitd31b928b93694de0a1408f36acb675485fea5973 (patch)
tree62932dca7174937a59c805fa8092b9b561a76e7d /src
parent02b632d8e8f2b14c155740d28c276b5869305c60 (diff)
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 <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/i965/brw_context.c2
-rw-r--r--src/mesa/drivers/dri/i965/brw_context.h2
-rw-r--r--src/mesa/drivers/dri/i965/brw_state_upload.c3
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;