Mesa (master): radv: check if addrlib enabled HTILE in radv_image_can_enable_htile()

[GitLab Mirror]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Wed Dec 12 14:15:52 2018 +0100

radv: check if addrlib enabled HTILE in radv_image_can_enable_htile()

When hile_size is 0, we can't enable HTILE. This doesn't change
anything, except not calling radv_image_alloc_htile().

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

---

 src/amd/vulkan/radv_image.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index 79e9ada011..0ac3d837fd 100644
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -932,7 +932,8 @@ radv_image_can_enable_fmask(struct radv_image *image)
 static inline bool
 radv_image_can_enable_htile(struct radv_image *image)
 {
-	return image->info.levels == 1 &&
+	return radv_image_has_htile(image) &&
+	       image->info.levels == 1 &&
 	       vk_format_is_depth(image->vk_format) &&
 	       image->info.width * image->info.height >= 8 * 8;
 }