[Mesa-dev] [PATCH 07/55] radeonsi: remove r600_pipe_common::save_qbo_state

[Marek Olšák]

From: Marek Olšák <marek.olsak at amd.com>

---
 src/gallium/drivers/radeon/r600_perfcounter.c | 2 +-
 src/gallium/drivers/radeon/r600_pipe_common.h | 2 --
 src/gallium/drivers/radeon/r600_query.c       | 2 +-
 src/gallium/drivers/radeonsi/si_state.c       | 3 +--
 src/gallium/drivers/radeonsi/si_state.h       | 1 +
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/radeon/r600_perfcounter.c b/src/gallium/drivers/radeon/r600_perfcounter.c
index 689f4a3..0e7b3d9 100644
--- a/src/gallium/drivers/radeon/r600_perfcounter.c
+++ b/src/gallium/drivers/radeon/r600_perfcounter.c
@@ -354,7 +354,7 @@ struct pipe_query *si_create_batch_query(struct pipe_context *ctx,
 	i = 0;
 	for (group = query->groups; group; group = group->next) {
 		struct r600_perfcounter_block *block = group->block;
-		unsigned select_dw, read_dw;
+		unsigned read_dw;
 		unsigned instances = 1;
 
 		if ((block->flags & R600_PC_BLOCK_SE) && group->se < 0)
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index f244356..99bba0a 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -509,8 +509,6 @@ struct r600_common_context {
 	void (*set_occlusion_query_state)(struct pipe_context *ctx,
 					  bool old_enable,
 					  bool old_perfect_enable);
-
-	void (*save_qbo_state)(struct pipe_context *ctx, struct r600_qbo_state *st);
 };
 
 /* r600_buffer_common.c */
diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c
index 89fb3df..d9c402c 100644
--- a/src/gallium/drivers/radeon/r600_query.c
+++ b/src/gallium/drivers/radeon/r600_query.c
@@ -1660,7 +1660,7 @@ static void r600_query_hw_get_result_resource(struct r600_common_context *rctx,
 			return;
 	}
 
-	rctx->save_qbo_state(&rctx->b, &saved_state);
+	si_save_qbo_state(&rctx->b, &saved_state);
 
 	r600_get_hw_query_params(rctx, query, index >= 0 ? index : 0, &params);
 	consts.end_offset = params.end_offset - params.start_offset;
diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 1e1ead0..06dcecc 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -1361,7 +1361,7 @@ static void si_set_occlusion_query_state(struct pipe_context *ctx,
 		si_mark_atom_dirty(sctx, &sctx->msaa_config);
 }
 
-static void si_save_qbo_state(struct pipe_context *ctx, struct r600_qbo_state *st)
+void si_save_qbo_state(struct pipe_context *ctx, struct r600_qbo_state *st)
 {
 	struct si_context *sctx = (struct si_context*)ctx;
 
@@ -4583,7 +4583,6 @@ void si_init_state_functions(struct si_context *sctx)
 
 	sctx->b.b.set_active_query_state = si_set_active_query_state;
 	sctx->b.set_occlusion_query_state = si_set_occlusion_query_state;
-	sctx->b.save_qbo_state = si_save_qbo_state;
 
 	sctx->b.b.draw_vbo = si_draw_vbo;
 
diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h
index 02659a7..60a724a 100644
--- a/src/gallium/drivers/radeonsi/si_state.h
+++ b/src/gallium/drivers/radeonsi/si_state.h
@@ -395,6 +395,7 @@ si_create_sampler_view_custom(struct pipe_context *ctx,
 			      unsigned width0, unsigned height0,
 			      unsigned force_level);
 void si_update_fb_dirtiness_after_rendering(struct si_context *sctx);
+void si_save_qbo_state(struct pipe_context *ctx, struct r600_qbo_state *st);
 
 /* si_state_binning.c */
 void si_emit_dpbb_state(struct si_context *sctx, struct r600_atom *state);
-- 
2.7.4