From 722ce747436f5b9c79d1fa4a8c59eed2f9cb611b Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Thu, 3 Sep 2015 01:54:32 +0300 Subject: [PATCH] gallium/radeon: remove 'dirty' member from r600_atom MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It's no longer used by both r600 and radeonsi now. Signed-off-by: Marek Olšák --- src/gallium/drivers/r600/r600_pipe.h | 2 -- src/gallium/drivers/r600/r600_state_common.c | 1 - src/gallium/drivers/radeon/r600_pipe_common.h | 3 +-- src/gallium/drivers/radeonsi/si_state.c | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index 76539d66ec6..25df831339c 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -514,8 +514,6 @@ static inline void r600_set_atom_dirty(struct r600_context *rctx, { uint64_t mask; - atom->dirty = dirty; - assert(atom->id != 0); assert(atom->id < sizeof(mask) * 8); mask = 1ull << atom->id; diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c index 39c65ae45c3..ae1341187cb 100644 --- a/src/gallium/drivers/r600/r600_state_common.c +++ b/src/gallium/drivers/r600/r600_state_common.c @@ -56,7 +56,6 @@ void r600_add_atom(struct r600_context *rctx, assert(rctx->atoms[id] == NULL); rctx->atoms[id] = atom; atom->id = id; - atom->dirty = false; } void r600_init_atom(struct r600_context *rctx, diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h index d22c230ea3c..534b987a2cc 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.h +++ b/src/gallium/drivers/radeon/r600_pipe_common.h @@ -316,8 +316,7 @@ struct r600_common_screen { struct r600_atom { void (*emit)(struct r600_common_context *ctx, struct r600_atom *state); unsigned num_dw; - unsigned short id; /* used by r600 only */ - bool dirty; + unsigned short id; }; struct r600_so_target { diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 1e2f32a8799..f698c59d87a 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -50,7 +50,6 @@ void si_init_atom(struct si_context *sctx, struct r600_atom *atom, void (*emit_func)(struct si_context *ctx, struct r600_atom *state)) { atom->emit = (void*)emit_func; - atom->dirty = false; atom->id = list_elem - sctx->atoms.array + 1; /* index+1 in the atom array */ *list_elem = atom; } -- 2.30.2