From 0447e8e59e9cbce196138d46dc0be07b7ed392a0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 1 Apr 2018 13:30:02 -0400 Subject: [PATCH] radeonsi: remove r600_pipe_common::set_atom_dirty Acked-by: Timothy Arceri --- 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(-) diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h index 96e68c574cb..b67aae6cdfe 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.h +++ b/src/gallium/drivers/radeon/r600_pipe_common.h @@ -516,9 +516,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 e736875d7cf..0ec53dd9192 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 964946d18d5..25aea06f9fb 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -259,7 +259,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; -- 2.30.2