From f7e9500dc27df9c2d910a749532a53e33f92bf52 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 1 Oct 2021 16:16:30 -0400 Subject: [PATCH] lavapipe: simplify some attachment derefs Reviewed-by: Dave Airlie Part-of: --- src/gallium/frontends/lavapipe/lvp_execute.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/frontends/lavapipe/lvp_execute.c b/src/gallium/frontends/lavapipe/lvp_execute.c index 074ea0f24bc..9fd269ef24f 100644 --- a/src/gallium/frontends/lavapipe/lvp_execute.c +++ b/src/gallium/frontends/lavapipe/lvp_execute.c @@ -1470,7 +1470,7 @@ static void render_subpass_clear(struct rendering_state *state) if (!attachment_needs_clear(state, ds)) return; - struct lvp_render_pass_attachment *att = &state->pass->attachments[ds]; + struct lvp_render_pass_attachment *att = subpass->depth_stencil_attachment[0]; struct lvp_image_view *imgv = get_attachment(state, ds); assert (util_format_is_depth_or_stencil(imgv->surface->format)); @@ -1572,7 +1572,7 @@ static void render_subpass_clear_fast(struct rendering_state *state) attachment_needs_clear(state, subpass->depth_stencil_attachment[0]->attachment)) { uint32_t ds = subpass->depth_stencil_attachment[0]->attachment; - struct lvp_render_pass_attachment *att = &state->pass->attachments[ds]; + struct lvp_render_pass_attachment *att = subpass->depth_stencil_attachment[0]; struct lvp_image_view *imgv = get_attachment(state, ds); const struct util_format_description *desc = util_format_description(imgv->surface->format); @@ -1702,7 +1702,7 @@ static void begin_render_subpass(struct rendering_state *state, struct lvp_render_pass_attachment *color_att = subpass->color_attachments[i]; if (color_att) { struct lvp_image_view *imgv = get_attachment(state, color_att->attachment); - add_img_view_surface(state, imgv, state->pass->attachments[color_att->attachment].format, state->framebuffer.width, state->framebuffer.height); + add_img_view_surface(state, imgv, color_att->format, state->framebuffer.width, state->framebuffer.height); state->framebuffer.cbufs[state->framebuffer.nr_cbufs] = imgv->surface; } else state->framebuffer.cbufs[state->framebuffer.nr_cbufs] = NULL; @@ -1714,7 +1714,7 @@ static void begin_render_subpass(struct rendering_state *state, if (ds_att) { struct lvp_image_view *imgv = get_attachment(state, ds_att->attachment); - add_img_view_surface(state, imgv, state->pass->attachments[ds_att->attachment].format, state->framebuffer.width, state->framebuffer.height); + add_img_view_surface(state, imgv, ds_att->format, state->framebuffer.width, state->framebuffer.height); state->framebuffer.zsbuf = imgv->surface; } }