Mesa (master): radv: fix clearing images with vkCmdClear{Color,DepthStencil}Image()

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 58c68bac392d2aa49baab7d59830ef893ee1287b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=58c68bac392d2aa49baab7d59830ef893ee1287b

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Tue Jan  5 08:36:59 2021 +0100

radv: fix clearing images with vkCmdClear{Color,DepthStencil}Image()

The image aspects field is actually never set and we should use the
range aspect anyways.

Fixes: 1a7b7b17ad0 ("radv: avoid oob read during clear")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8324>

---

 src/amd/vulkan/radv_meta_clear.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amd/vulkan/radv_meta_clear.c b/src/amd/vulkan/radv_meta_clear.c
index 3ac9aa71e62..ec5435ca04c 100644
--- a/src/amd/vulkan/radv_meta_clear.c
+++ b/src/amd/vulkan/radv_meta_clear.c
@@ -2206,7 +2206,7 @@ radv_cmd_clear_image(struct radv_cmd_buffer *cmd_buffer,
 	VkFormat format = image->vk_format;
 	VkClearValue internal_clear_value;
 
-        if (image->aspects & VK_IMAGE_ASPECT_COLOR_BIT)
+        if (ranges->aspectMask & VK_IMAGE_ASPECT_COLOR_BIT)
                 internal_clear_value.color = clear_value->color;
         else
                 internal_clear_value.depthStencil = clear_value->depthStencil;