From fa31e5e295e4391eb6e20779b91906f7a0d4997d Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 6 May 2026 11:59:23 -0400 Subject: [PATCH] lavapipe: unset attachment remap state if pColorAttachmentLocations==NULL cc: mesa-stable (cherry picked from commit abc6f351b1f5e1dfa84bf6320a842886b02b8131) Part-of: --- .pick_status.json | 2 +- src/gallium/frontends/lavapipe/lvp_execute.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 6f3ac010224..dfc8e65c4a2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2954,7 +2954,7 @@ "description": "lavapipe: unset attachment remap state if pColorAttachmentLocations==NULL", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/frontends/lavapipe/lvp_execute.c b/src/gallium/frontends/lavapipe/lvp_execute.c index f344c3b1a41..54b483781a8 100644 --- a/src/gallium/frontends/lavapipe/lvp_execute.c +++ b/src/gallium/frontends/lavapipe/lvp_execute.c @@ -1891,7 +1891,7 @@ static void handle_rendering_attachment_locations(struct vk_cmd_queue_entry *cmd, struct rendering_state *state) { VkRenderingAttachmentLocationInfoKHR *set = cmd->u.set_rendering_attachment_locations.location_info; - state->fb_remapped = true; + state->fb_remapped = !!set->pColorAttachmentLocations; memset(state->fb_map, PIPE_MAX_COLOR_BUFS, sizeof(state->fb_map)); assert(state->color_att_count == set->colorAttachmentCount); if (set->pColorAttachmentLocations) {