We now use brw->NewGLState and brw->ctx.NewDriverState instead.
Suggested-by: Kenneth Graunke <kenneth at whitecape.org>
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
---
src/mesa/drivers/dri/i965/brw_context.h | 1 -
src/mesa/drivers/dri/i965/brw_state_upload.c | 6 ------
2 files changed, 7 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index ed250d2..6c168a3 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -1117,7 +1117,6 @@ struct brw_context
GLuint NewGLState;
struct {
- struct brw_state_flags dirty;
struct brw_state_flags pipelines[BRW_NUM_PIPELINES];
} state;
diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c
index e75ae2e..e405c22 100644
--- a/src/mesa/drivers/dri/i965/brw_state_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_state_upload.c
@@ -614,9 +614,7 @@ merge_ctx_state(struct brw_context *brw,
struct brw_state_flags *state)
{
state->mesa |= brw->NewGLState;
- assert(brw->state.dirty.mesa == 0);
state->brw |= brw->ctx.NewDriverState;
- assert(brw->state.dirty.brw == 0ull);
}
static inline void
@@ -635,7 +633,6 @@ brw_upload_pipeline_state(struct brw_context *brw,
enum brw_pipeline pipeline)
{
struct gl_context *ctx = &brw->ctx;
- struct brw_state_flags *brw_state = &brw->state.dirty;
int i;
static int dirty_count = 0;
struct brw_state_flags state = brw->state.pipelines[pipeline];
@@ -748,8 +745,6 @@ static inline void
brw_pipeline_state_finished(struct brw_context *brw,
enum brw_pipeline pipeline)
{
- struct brw_state_flags *state = &brw->state.dirty;
-
/* Save all dirty state into the other pipelines */
for (int i = 0; i < BRW_NUM_PIPELINES; i++) {
if (i != pipeline) {
@@ -762,7 +757,6 @@ brw_pipeline_state_finished(struct brw_context *brw,
brw->NewGLState = 0;
brw->ctx.NewDriverState = 0ull;
- memset(state, 0, sizeof(*state));
}
/**
--
2.1.4