diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_perfcounter.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/r600_query.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 3 | ||||
| -rw-r--r-- | 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 689f4a38edc..0e7b3d910f8 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 09bc4ea9783..c4ea893952e 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.h +++ b/src/gallium/drivers/radeon/r600_pipe_common.h @@ -510,8 +510,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 89fb3dffff6..d9c402c0089 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, ¶ms); 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 08ba5c0b7dc..8b2f075bd48 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; @@ -4589,7 +4589,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 37887853388..dcf38055f4f 100644 --- a/src/gallium/drivers/radeonsi/si_state.h +++ b/src/gallium/drivers/radeonsi/si_state.h @@ -403,6 +403,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 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); |