From db8a202b41a706b9f7c5c12aea24736418ccabf2 Mon Sep 17 00:00:00 2001 From: "Juan A. Suarez Romero" Date: Fri, 18 Feb 2022 13:53:30 +0100 Subject: [PATCH] vc4: remove redundant initialization MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These assignments are not required. Partially fixes https://gitlab.freedesktop.org/mesa/mesa/-/issues/3966 Signed-off-by: Juan A. Suarez Romero Reviewed-by: Alejandro Piñeiro Part-of: --- src/gallium/drivers/vc4/vc4_blit.c | 9 --------- src/gallium/drivers/vc4/vc4_qir.c | 1 - 2 files changed, 10 deletions(-) diff --git a/src/gallium/drivers/vc4/vc4_blit.c b/src/gallium/drivers/vc4/vc4_blit.c index 9f4ab89e57f..e63ef6108fb 100644 --- a/src/gallium/drivers/vc4/vc4_blit.c +++ b/src/gallium/drivers/vc4/vc4_blit.c @@ -132,15 +132,6 @@ vc4_tile_blit(struct pipe_context *pctx, const struct pipe_blit_info *info) struct vc4_job *job = vc4_get_job(vc4, dst_surf, NULL); pipe_surface_reference(&job->color_read, src_surf); - /* If we're resolving from MSAA to single sample, we still need to run - * the engine in MSAA mode for the load. - */ - if (!job->msaa && info->src.resource->nr_samples > 1) { - job->msaa = true; - job->tile_width = 32; - job->tile_height = 32; - } - job->draw_min_x = info->dst.box.x; job->draw_min_y = info->dst.box.y; job->draw_max_x = info->dst.box.x + info->dst.box.width; diff --git a/src/gallium/drivers/vc4/vc4_qir.c b/src/gallium/drivers/vc4/vc4_qir.c index 0d104c06150..9c7e735e9ec 100644 --- a/src/gallium/drivers/vc4/vc4_qir.c +++ b/src/gallium/drivers/vc4/vc4_qir.c @@ -808,7 +808,6 @@ qir_SF(struct vc4_compile *c, struct qreg src) !c->defs[src.index] || last_inst != c->defs[src.index]) { last_inst = qir_MOV_dest(c, qir_reg(QFILE_NULL, 0), src); - last_inst = (struct qinst *)c->cur_block->instructions.prev; } last_inst->sf = true; }