summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>2018-09-03 02:34:04 +0200
committerDylan Baker <dylan@pnwbakers.com>2018-09-04 08:50:09 -0700
commit5872b1522aed0f07d86fb219aa57e364a95cfff8 (patch)
tree19496907c661c9d97b84cc9ece3c1d554997d815
parentf58f2f67548819845558fe1ff6d0e600f70eb4b8 (diff)
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> (cherry picked from commit 233718a199f96f71f7c0d2063d9a434dc3447d86)
-rw-r--r--src/amd/vulkan/radv_image.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index a6f3628c8f8..8e7666d3366 100644
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -830,8 +830,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. */