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

Author: Marek Olšák <[email protected]>
Date:   Tue Aug 28 14:39:09 2018 -0400

winsys/radeon: fix CMASK fast clear for NPOT textures with mipmapping on SI/CI

Cc: 18.2 <[email protected]>
Tested-by: Dieter Nützel <[email protected]>

---

 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 fda1ba7870..20cfc86ebe 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. */

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to