radv: Fix CMASK dimensions.

Mirrors

1e40f694831 "ac/surface: fix CMASK fast clear for NPOT textures with mipmapping on SI/CI/VI"

CC: <mesa-stable@lists.freedesktop.org>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>

diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index f1c78e8115d98549f4cf5ca9bd9e1be3f050d1e8..b316242dc5aba5f49d31de63388c672f39b248df 100644 (file)
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -801,8 +801,8 @@ radv_image_get_cmask_info(struct radv_device *device,
 
        unsigned base_align = num_pipes * pipe_interleave_bytes;
 
-       unsigned width = align(image->info.width, cl_width*8);
-       unsigned height = align(image->info.height, cl_height*8);
+       unsigned width = align(image->surface.u.legacy.level[0].nblk_x, cl_width*8);
+       unsigned height = align(image->surface.u.legacy.level[0].nblk_y, cl_height*8);
        unsigned slice_elements = (width * height) / (8*8);
 
        /* Each element of CMASK is a nibble. */