From: Jason Ekstrand <jason@jlekstrand.net>
Date: Sat, 7 Mar 2020 01:22:57 +0000 (-0600)
Subject: anv: Simplify a case in layout_to_aux_usage
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=65e541ab16a156b0128e4c6917af86d0a6be264c;p=mesa.git

anv: Simplify a case in layout_to_aux_usage

If it's depth, the only possible value of planes[plane].aux_usage is
ISL_AUX_USAGE_HIZ at least right now.

Reviewed-by: Rafael Antognolli <rafael.antognolli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4100>
---

diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c
index ea9be68e762..3fb48d0b3cd 100644
--- a/src/intel/vulkan/anv_image.c
+++ b/src/intel/vulkan/anv_image.c
@@ -1499,12 +1499,7 @@ anv_layout_to_aux_usage(const struct gen_device_info * const devinfo,
 
    case ISL_AUX_STATE_COMPRESSED_CLEAR:
    case ISL_AUX_STATE_COMPRESSED_NO_CLEAR:
-      if (aspect == VK_IMAGE_ASPECT_DEPTH_BIT) {
-         return ISL_AUX_USAGE_HIZ;
-      } else {
-         assert(image->planes[plane].aux_usage != ISL_AUX_USAGE_NONE);
-         return image->planes[plane].aux_usage;
-      }
+      return image->planes[plane].aux_usage;
 
    case ISL_AUX_STATE_RESOLVED:
       /* We can only use RESOLVED in read-only layouts because any write will