From: Marek Olšák Date: Tue, 28 Aug 2018 18:39:09 +0000 (-0400) Subject: winsys/radeon: fix CMASK fast clear for NPOT textures with mipmapping on SI/CI X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d4e52281aa9c1acc92619736da8b67d8c02ce380;p=mesa.git winsys/radeon: fix CMASK fast clear for NPOT textures with mipmapping on SI/CI Cc: 18.2 Tested-by: Dieter Nützel --- diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_surface.c b/src/gallium/winsys/radeon/drm/radeon_drm_surface.c index fda1ba7870e..20cfc86ebe0 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_surface.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_surface.c @@ -257,8 +257,8 @@ static void si_compute_cmask(const struct radeon_info *info, unsigned base_align = num_pipes * pipe_interleave_bytes; - unsigned width = align(config->info.width, cl_width*8); - unsigned height = align(config->info.height, cl_height*8); + unsigned width = align(surf->u.legacy.level[0].nblk_x, cl_width*8); + unsigned height = align(surf->u.legacy.level[0].nblk_y, cl_height*8); unsigned slice_elements = (width * height) / (8*8); /* Each element of CMASK is a nibble. */