From f8bc628b2ceb13c8d1ddfa28b81dbef4159928b6 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Tue, 24 Jan 2017 23:37:56 +0100 Subject: gallium/radeon: merge dirty_fb_counter and dirty_tex_descriptor_counter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to simplify things in draw_vbo a little Reviewed-by: Nicolai Hähnle --- src/gallium/drivers/r600/r600_state_common.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gallium/drivers/r600') diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c index a9dbc8bc982..c8502e90ea9 100644 --- a/src/gallium/drivers/r600/r600_state_common.c +++ b/src/gallium/drivers/r600/r600_state_common.c @@ -1669,7 +1669,7 @@ static void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info struct radeon_winsys_cs *cs = rctx->b.gfx.cs; bool render_cond_bit = rctx->b.render_cond && !rctx->b.render_cond_force_off; uint64_t mask; - unsigned num_patches, dirty_fb_counter; + unsigned num_patches, dirty_tex_counter; if (!info.indirect && !info.count && (info.indexed || !info.count_from_stream_output)) { return; @@ -1686,9 +1686,9 @@ static void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info } /* Re-emit the framebuffer state if needed. */ - dirty_fb_counter = p_atomic_read(&rctx->b.screen->dirty_fb_counter); - if (dirty_fb_counter != rctx->b.last_dirty_fb_counter) { - rctx->b.last_dirty_fb_counter = dirty_fb_counter; + dirty_tex_counter = p_atomic_read(&rctx->b.screen->dirty_tex_counter); + if (dirty_tex_counter != rctx->b.last_dirty_tex_counter) { + rctx->b.last_dirty_tex_counter = dirty_tex_counter; r600_mark_atom_dirty(rctx, &rctx->framebuffer.atom); } -- cgit v1.2.3