From 90d12f1d776f41ab3d72cea5b2bc39bf9ee28b25 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Sun, 1 Apr 2018 17:52:55 -0400 Subject: radeonsi: rename r600 -> si in some places Acked-by: Timothy Arceri --- src/gallium/drivers/radeonsi/si_perfcounter.c | 8 ++++---- src/gallium/drivers/radeonsi/si_pipe.h | 4 ++-- src/gallium/drivers/radeonsi/si_state.c | 2 +- src/gallium/drivers/radeonsi/si_state.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/gallium/drivers/radeonsi') diff --git a/src/gallium/drivers/radeonsi/si_perfcounter.c b/src/gallium/drivers/radeonsi/si_perfcounter.c index 76160a08092..89a849c23b8 100644 --- a/src/gallium/drivers/radeonsi/si_perfcounter.c +++ b/src/gallium/drivers/radeonsi/si_perfcounter.c @@ -456,7 +456,7 @@ static void si_pc_emit_shaders(struct si_context *sctx, } static void si_pc_emit_select(struct si_context *sctx, - struct r600_perfcounter_block *group, + struct si_perfcounter_block *group, unsigned count, unsigned *selectors) { struct si_pc_block *sigroup = (struct si_pc_block *)group->data; @@ -597,7 +597,7 @@ static void si_pc_emit_stop(struct si_context *sctx, } static void si_pc_emit_read(struct si_context *sctx, - struct r600_perfcounter_block *group, + struct si_perfcounter_block *group, unsigned count, unsigned *selectors, struct r600_resource *buffer, uint64_t va) { @@ -650,7 +650,7 @@ static void si_pc_cleanup(struct si_screen *sscreen) void si_init_perfcounters(struct si_screen *screen) { - struct r600_perfcounters *pc; + struct si_perfcounters *pc; struct si_pc_block *blocks; unsigned num_blocks; unsigned i; @@ -680,7 +680,7 @@ void si_init_perfcounters(struct si_screen *screen) screen->info.max_sh_per_se); } - pc = CALLOC_STRUCT(r600_perfcounters); + pc = CALLOC_STRUCT(si_perfcounters); if (!pc) return; diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index 7feec263c99..3d489eeb720 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -153,11 +153,11 @@ struct si_screen { /* GPU load thread. */ mtx_t gpu_load_mutex; thrd_t gpu_load_thread; - union r600_mmio_counters mmio_counters; + union si_mmio_counters mmio_counters; volatile unsigned gpu_load_stop_thread; /* bool */ /* Performance counters. */ - struct r600_perfcounters *perfcounters; + struct si_perfcounters *perfcounters; /* If pipe_screen wants to recompute and re-emit the framebuffer, * sampler, and image states of all contexts, it should atomically diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 26feb654a91..d827885407a 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -1359,7 +1359,7 @@ void si_set_occlusion_query_state(struct si_context *sctx, si_mark_atom_dirty(sctx, &sctx->msaa_config); } -void si_save_qbo_state(struct si_context *sctx, struct r600_qbo_state *st) +void si_save_qbo_state(struct si_context *sctx, struct si_qbo_state *st) { st->saved_compute = sctx->cs_shader_state.program; diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h index c4ba2767d0d..e9849a992f0 100644 --- a/src/gallium/drivers/radeonsi/si_state.h +++ b/src/gallium/drivers/radeonsi/si_state.h @@ -405,7 +405,7 @@ si_create_sampler_view_custom(struct pipe_context *ctx, unsigned force_level); void si_update_fb_dirtiness_after_rendering(struct si_context *sctx); void si_update_ps_iter_samples(struct si_context *sctx); -void si_save_qbo_state(struct si_context *sctx, struct r600_qbo_state *st); +void si_save_qbo_state(struct si_context *sctx, struct si_qbo_state *st); void si_set_occlusion_query_state(struct si_context *sctx, bool old_perfect_enable); -- cgit v1.2.3