From c09bb956ca1ee97a890543dd376c5a1287dd3f23 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Mon, 13 Mar 2017 08:10:38 -0700 Subject: [PATCH] anv/image: Move handling of INTEL_VK_HIZ This makes it so that you don't get an "Implement gen7 HiZ" perf warning when you manually disable HiZ on gen8. Reviewed-by: Topi Pohjolainen --- src/intel/vulkan/anv_image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c index 5f17351e66a..931ee221d86 100644 --- a/src/intel/vulkan/anv_image.c +++ b/src/intel/vulkan/anv_image.c @@ -190,7 +190,7 @@ make_surface(const struct anv_device *dev, */ if (!(image->usage & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT)) { /* It will never be used as an attachment, HiZ is pointless. */ - } else if (!env_var_as_boolean("INTEL_VK_HIZ", dev->info.gen >= 8)) { + } else if (dev->info.gen == 7) { anv_perf_warn("Implement gen7 HiZ"); } else if (vk_info->mipLevels > 1) { anv_perf_warn("Enable multi-LOD HiZ"); @@ -198,7 +198,7 @@ make_surface(const struct anv_device *dev, anv_perf_warn("Implement multi-arrayLayer HiZ clears and resolves"); } else if (dev->info.gen == 8 && vk_info->samples > 1) { anv_perf_warn("Enable gen8 multisampled HiZ"); - } else { + } else if (env_var_as_boolean("INTEL_VK_HIZ", true)) { assert(image->aux_surface.isl.size == 0); ok = isl_surf_get_hiz_surf(&dev->isl_dev, &image->depth_surface.isl, &image->aux_surface.isl); -- 2.30.2