diff options
| author | Jordan Justen <[email protected]> | 2015-03-20 00:46:03 -0700 |
|---|---|---|
| committer | Jordan Justen <[email protected]> | 2015-03-31 16:40:24 -0700 |
| commit | 22ccdf12dd7b5db6eb0c8f2b03c3516f8376fdad (patch) | |
| tree | 4b9fb213eeb2999741be5be17f87c238686309f5 /src | |
| parent | 7ecf3530d87e88971fd77d35ac23c5383630d35b (diff) | |
i965/state: Remove brw->state.dirty
We now use brw->NewGLState and brw->ctx.NewDriverState instead.
Suggested-by: Kenneth Graunke <[email protected]>
Signed-off-by: Jordan Justen <[email protected]>
Reviewed-by: Kristian Høgsberg <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.h | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_state_upload.c | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index ed250d2c6a7..6c168a33eba 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 f6369066100..ab316bfc431 100644 --- a/src/mesa/drivers/dri/i965/brw_state_upload.c +++ b/src/mesa/drivers/dri/i965/brw_state_upload.c @@ -624,9 +624,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 @@ -645,7 +643,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]; @@ -758,8 +755,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) { @@ -772,7 +767,6 @@ brw_pipeline_state_finished(struct brw_context *brw, brw->NewGLState = 0; brw->ctx.NewDriverState = 0ull; - memset(state, 0, sizeof(*state)); } /** |