From 70c565478988229251ee368aae930675fe272a4e Mon Sep 17 00:00:00 2001 From: Nick Hamilton Date: Tue, 31 Mar 2026 17:05:54 +0100 Subject: [PATCH] pvr: Revert don't csb emit multi-layer clear attachments without rta support While testing HW without gs_rta_support it was raised that this change had been made in error. After retesting with the change reverted the listed tests still pass. This reverts commit d68344bffe893c1ecaa63ce5f2795c3479517da6. Backport-to: 26.0 Reported-by: Luigi Santivetti Signed-off-by: Nick Hamilton Reviewed-by: Luigi Santivetti (cherry picked from commit 08c13564d68101519bfecd45d94af7072050b6ed) Part-of: --- .pick_status.json | 2 +- src/imagination/vulkan/rogue/pvr_blit.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index efbe4528fd3..03ba72df9e7 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -6204,7 +6204,7 @@ "description": "pvr: Revert don't csb emit multi-layer clear attachments without rta support", "nominated": true, "nomination_type": 4, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/imagination/vulkan/rogue/pvr_blit.c b/src/imagination/vulkan/rogue/pvr_blit.c index 61afdd22eae..490e8d27b48 100644 --- a/src/imagination/vulkan/rogue/pvr_blit.c +++ b/src/imagination/vulkan/rogue/pvr_blit.c @@ -2188,7 +2188,9 @@ static void pvr_clear_attachments(struct pvr_cmd_buffer *cmd_buffer, if (result != VK_SUCCESS) return; - continue; + if (clear_rect->baseArrayLayer != 0) + continue; + } else { pvr_finishme( "incomplete support for deferred (emulated) RTA clears");