Mesa (master): ilo: make sure there is HiZ before resolving

[Chia-I Wu]

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

Author: Chia-I Wu <olvaffe at gmail.com>
Date:   Thu Oct 22 11:29:17 2015 +0800

ilo: make sure there is HiZ before resolving

We do not want to perform a depth resolve on an MCS enabled surface.

---

 src/gallium/drivers/ilo/ilo_blit.h |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/ilo/ilo_blit.h b/src/gallium/drivers/ilo/ilo_blit.h
index da0bfe9..bad4dab 100644
--- a/src/gallium/drivers/ilo/ilo_blit.h
+++ b/src/gallium/drivers/ilo/ilo_blit.h
@@ -58,10 +58,12 @@ ilo_blit_resolve_slices(struct ilo_context *ilo,
     * As it is only used to resolve HiZ right now, return early when there is
     * no HiZ.
     */
-   if (!ilo_image_can_enable_aux(&tex->image, level))
+   if (tex->image.aux.type != ILO_IMAGE_AUX_HIZ ||
+       !ilo_image_can_enable_aux(&tex->image, level))
       return;
 
-   if (ilo_image_can_enable_aux(&tex->image, level)) {
+   if (tex->image.aux.type == ILO_IMAGE_AUX_HIZ &&
+       ilo_image_can_enable_aux(&tex->image, level)) {
       ilo_blit_resolve_slices_for_hiz(ilo, res, level,
             first_slice, num_slices, resolve_flags);
    }