[Mesa-dev] [PATCH 02/15] winsys/radeon: fix CMASK fast clear for NPOT textures with mipmapping on SI/CI

[Marek Olšák]

From: Marek Olšák <marek.ol...@amd.com>

Cc: 18.1 18.2 <mesa-sta...@lists.freedesktop.org>
---
 src/gallium/winsys/radeon/drm/radeon_drm_surface.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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
@@ -250,22 +250,22 @@ static void si_compute_cmask(const struct radeon_info 
*info,
                cl_width = 64;
                cl_height = 64;
                break;
        default:
                assert(0);
                return;
        }
 
        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. */
        unsigned slice_bytes = slice_elements / 2;
 
        surf->u.legacy.cmask_slice_tile_max = (width * height) / (128*128);
        if (surf->u.legacy.cmask_slice_tile_max)
                surf->u.legacy.cmask_slice_tile_max -= 1;
 
        unsigned num_layers;
-- 
2.17.1

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev