Module: Mesa Branch: main Commit: 20db03d32fbb63526e890de74072718f17dfbe4e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=20db03d32fbb63526e890de74072718f17dfbe4e
Author: Sagar Ghuge <[email protected]> Date: Wed Aug 16 10:11:29 2023 -0700 anv,hasvk: drop unnecessary DEBUG_NO_CCS/NO_HIZ checks Now isl_surf_supports_ccs helper handles DEBUG_NO_CCS check and isl_surf_get_hiz_surf handles DEBUG_NO_HIZ, so we don't need to check it everywhere. Signed-off-by: Sagar Ghuge <[email protected]> Reviewed-by: Nanley Chery <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24731> --- src/intel/vulkan/anv_image.c | 10 ---------- src/intel/vulkan_hasvk/anv_image.c | 6 ------ 2 files changed, 16 deletions(-) diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c index cbdd0900683..0c42716d3e8 100644 --- a/src/intel/vulkan/anv_image.c +++ b/src/intel/vulkan/anv_image.c @@ -677,9 +677,6 @@ add_aux_surface_if_supported(struct anv_device *device, return VK_SUCCESS; } - if (INTEL_DEBUG(DEBUG_NO_HIZ)) - return VK_SUCCESS; - ok = isl_surf_get_hiz_surf(&device->isl_dev, &image->planes[plane].primary_surface.isl, &image->planes[plane].aux_surface.isl); @@ -717,10 +714,6 @@ add_aux_surface_if_supported(struct anv_device *device, if (image->planes[plane].aux_usage == ISL_AUX_USAGE_HIZ_CCS_WT) return add_aux_state_tracking_buffer(device, image, plane); } else if (aspect == VK_IMAGE_ASPECT_STENCIL_BIT) { - - if (INTEL_DEBUG(DEBUG_NO_CCS)) - return VK_SUCCESS; - if (!isl_surf_supports_ccs(&device->isl_dev, &image->planes[plane].primary_surface.isl, NULL)) @@ -748,9 +741,6 @@ add_aux_surface_if_supported(struct anv_device *device, return VK_SUCCESS; } - if (INTEL_DEBUG(DEBUG_NO_CCS)) - return VK_SUCCESS; - ok = isl_surf_get_ccs_surf(&device->isl_dev, &image->planes[plane].primary_surface.isl, NULL, diff --git a/src/intel/vulkan_hasvk/anv_image.c b/src/intel/vulkan_hasvk/anv_image.c index 0d81339990d..cd236be484c 100644 --- a/src/intel/vulkan_hasvk/anv_image.c +++ b/src/intel/vulkan_hasvk/anv_image.c @@ -617,9 +617,6 @@ add_aux_surface_if_supported(struct anv_device *device, return VK_SUCCESS; } - if (INTEL_DEBUG(DEBUG_NO_HIZ)) - return VK_SUCCESS; - ok = isl_surf_get_hiz_surf(&device->isl_dev, &image->planes[plane].primary_surface.isl, &image->planes[plane].aux_surface.isl); @@ -646,9 +643,6 @@ add_aux_surface_if_supported(struct anv_device *device, return VK_SUCCESS; } - if (INTEL_DEBUG(DEBUG_NO_CCS)) - return VK_SUCCESS; - ok = isl_surf_get_ccs_surf(&device->isl_dev, &image->planes[plane].primary_surface.isl, NULL,
