[03/55] radeonsi: remove r600_pipe_common::set_atom_dirty

Submitted by Marek Olšák on April 2, 2018, 4:07 a.m.

Details

Message ID 1522642128-15348-4-git-send-email-maraeo@gmail.com
State Accepted
Commit 0447e8e59e9cbce196138d46dc0be07b7ed392a0
Headers show
Series "RadeonSI Mega cleanup" ( rev: 1 ) in Mesa

Not browsing as part of any series.

Commit Message

Marek Olšák April 2, 2018, 4:07 a.m.
From: Marek Olšák <marek.olsak@amd.com>

---
 src/gallium/drivers/radeon/r600_pipe_common.h | 3 ---
 src/gallium/drivers/radeon/r600_query.c       | 2 +-
 src/gallium/drivers/radeonsi/si_pipe.c        | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

Patch hide | download patch | download mbox

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index f5837bd..ca456e4 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -515,9 +515,6 @@  struct r600_common_context {
 	/* This ensures there is enough space in the command stream. */
 	void (*need_gfx_cs_space)(struct pipe_context *ctx, unsigned num_dw,
 				  bool include_draw_vbo);
-
-	void (*set_atom_dirty)(struct r600_common_context *ctx,
-			       struct r600_atom *atom, bool dirty);
 };
 
 /* r600_buffer_common.c */
diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c
index e736875..0ec53dd 100644
--- a/src/gallium/drivers/radeon/r600_query.c
+++ b/src/gallium/drivers/radeon/r600_query.c
@@ -1832,7 +1832,7 @@  static void r600_render_condition(struct pipe_context *ctx,
 	rctx->render_cond_invert = condition;
 	rctx->render_cond_mode = mode;
 
-	rctx->set_atom_dirty(rctx, atom, query != NULL);
+	si_set_atom_dirty((struct si_context*)rctx, atom, query != NULL);
 }
 
 void si_suspend_queries(struct r600_common_context *ctx)
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 3456dff..7e7a8b7 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -258,7 +258,6 @@  static struct pipe_context *si_create_context(struct pipe_screen *screen,
 	sctx->b.b.emit_string_marker = si_emit_string_marker;
 	sctx->b.b.set_debug_callback = si_set_debug_callback;
 	sctx->b.b.set_log_context = si_set_log_context;
-	sctx->b.set_atom_dirty = (void *)si_set_atom_dirty;
 	sctx->screen = sscreen; /* Easy accessing of screen/winsys. */
 	sctx->is_debug = (flags & PIPE_CONTEXT_DEBUG) != 0;