From 67e01cb74a838cd64c872afb4a6bcc965d7a86af Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 2 May 2023 11:26:29 +0200 Subject: [PATCH] radv: fix fast-clearing images with VK_REMAINING_{ARRAY_LAYERS,MIP_LEVELS} Found by inspection. Cc: mesa-stable Signed-off-by: Samuel Pitoiset Part-of: (cherry picked from commit a77c88f1e897d5ab5c046b35898eadbe806e2990) [Eric: removed erroneous leftover `->layerCount`] --- .pick_status.json | 2 +- src/amd/vulkan/meta/radv_meta_clear.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 135634d9533..bddd81a5daf 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -949,7 +949,7 @@ "description": "radv: fix fast-clearing images with VK_REMAINING_{ARRAY_LAYERS,MIP_LEVELS}", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/amd/vulkan/meta/radv_meta_clear.c b/src/amd/vulkan/meta/radv_meta_clear.c index e7dfb77b0ff..a69898f385c 100644 --- a/src/amd/vulkan/meta/radv_meta_clear.c +++ b/src/amd/vulkan/meta/radv_meta_clear.c @@ -2113,9 +2113,9 @@ radv_fast_clear_range(struct radv_cmd_buffer *cmd_buffer, struct radv_image *ima { .aspectMask = range->aspectMask, .baseMipLevel = range->baseMipLevel, - .levelCount = range->levelCount, + .levelCount = radv_get_levelCount(image, range), .baseArrayLayer = range->baseArrayLayer, - .layerCount = range->layerCount, + .layerCount = radv_get_layerCount(image, range), }, }, 0, NULL); @@ -2131,7 +2131,7 @@ radv_fast_clear_range(struct radv_cmd_buffer *cmd_buffer, struct radv_image *ima }, }, .baseArrayLayer = range->baseArrayLayer, - .layerCount = range->layerCount, + .layerCount = radv_get_layerCount(image, range), }; VkClearAttachment clear_att = {