From: Samuel Pitoiset Date: Fri, 2 Aug 2019 11:55:01 +0000 (+0200) Subject: radv: fix image_has_{cmask,fmask}() helpers X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e8110e51c6f5ca369100b4771eaaa4e5cbe9e0df;p=mesa.git radv: fix image_has_{cmask,fmask}() helpers The driver should now rely on cmask_offset because CMASK can be disabled by the driver for some reasons (eg. mipmaps). Apply the same change for FMASK, although it should be useless. Fixes: ad1bc8621df ("radv: remove radv_get_image_fmask_info()") Fixes: 10d08da52c6 ("radv/gfx10: add missing dcc_tile_swizzle tweak") Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen --- diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index 49d3c78db98..ee0761e69fe 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -1633,7 +1633,7 @@ bool radv_layout_dcc_compressed(const struct radv_image *image, static inline bool radv_image_has_cmask(const struct radv_image *image) { - return image->planes[0].surface.cmask_size; + return image->cmask_offset; } /** @@ -1642,7 +1642,7 @@ radv_image_has_cmask(const struct radv_image *image) static inline bool radv_image_has_fmask(const struct radv_image *image) { - return image->planes[0].surface.fmask_size; + return image->fmask_offset; } /**