Module: Mesa Branch: main Commit: 569f80f2dfcd4cc31d3d9f835b9c573b7ddb1dca URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=569f80f2dfcd4cc31d3d9f835b9c573b7ddb1dca
Author: Nanley Chery <[email protected]> Date: Wed Jun 21 12:53:08 2023 -0400 anv: Reduce accesses of isl_mod_info->aux_usage This field will be replaced in an upcoming patch. Reviewed-by: Lionel Landwerlin <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24120> --- src/intel/vulkan/anv_formats.c | 10 +++++----- src/intel/vulkan/anv_image.c | 2 +- src/intel/vulkan/genX_cmd_buffer.c | 10 ++++++---- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c index 40b4f1110bd..a2e6212885a 100644 --- a/src/intel/vulkan/anv_formats.c +++ b/src/intel/vulkan/anv_formats.c @@ -775,17 +775,17 @@ anv_get_image_format_features2(const struct anv_physical_device *physical_device * planes and aux planes due to the lack of defined ABI for external * multi-planar images. */ - if (isl_mod_info->aux_usage != ISL_AUX_USAGE_NONE) { + if (isl_drm_modifier_has_aux(isl_mod_info->modifier)) { return 0; } } - if (isl_aux_usage_has_ccs_e(isl_mod_info->aux_usage) && + if (isl_drm_modifier_has_aux(isl_mod_info->modifier) && !isl_format_supports_ccs_e(devinfo, plane_format.isl_format)) { return 0; } - if (isl_mod_info->aux_usage != ISL_AUX_USAGE_NONE) { + if (isl_drm_modifier_has_aux(isl_mod_info->modifier)) { /* Rejection DISJOINT for consistency with the GL driver. In * eglCreateImage, we require that the dma_buf for the primary surface * and the dma_buf for its aux surface refer to the same bo. @@ -1340,7 +1340,7 @@ anv_get_image_format_properties( maxMipLevels = 1; sampleCounts = VK_SAMPLE_COUNT_1_BIT; - if (isl_mod_info->aux_usage == ISL_AUX_USAGE_CCS_E && + if (isl_drm_modifier_has_aux(isl_mod_info->modifier) && !anv_formats_ccs_e_compatible(devinfo, info->flags, info->format, info->tiling, info->usage, format_list_info)) { @@ -1405,7 +1405,7 @@ anv_get_image_format_properties( } if (info->tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT && - isl_mod_info->aux_usage != ISL_AUX_USAGE_NONE) { + isl_drm_modifier_has_aux(isl_mod_info->modifier)) { /* Rejection DISJOINT for consistency with the GL driver. In * eglCreateImage, we require that the dma_buf for the primary surface * and the dma_buf for its aux surface refer to the same bo. diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c index 4d341e427de..66348c4535d 100644 --- a/src/intel/vulkan/anv_image.c +++ b/src/intel/vulkan/anv_image.c @@ -1099,7 +1099,7 @@ check_drm_format_mod(const struct anv_device *device, assert(isl_layout->colorspace == ISL_COLORSPACE_LINEAR || isl_layout->colorspace == ISL_COLORSPACE_SRGB); - if (isl_mod_info->aux_usage != ISL_AUX_USAGE_NONE) { + if (isl_drm_modifier_has_aux(isl_mod_info->modifier)) { /* Reject DISJOINT for consistency with the GL driver. */ assert(!image->disjoint); diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 1afb928b004..b766dadd683 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -971,11 +971,13 @@ transition_color_buffer(struct anv_cmd_buffer *cmd_buffer, * of acquire/release direction. */ if (private_binding_acquire) { - initial_aux_usage = isl_mod_info->aux_usage; + initial_aux_usage = isl_drm_modifier_has_aux(isl_mod_info->modifier) ? + image->planes[plane].aux_usage : ISL_AUX_USAGE_NONE; initial_fast_clear = isl_mod_info->supports_clear_color ? initial_fast_clear : ANV_FAST_CLEAR_NONE; } else if (private_binding_release) { - final_aux_usage = isl_mod_info->aux_usage; + final_aux_usage = isl_drm_modifier_has_aux(isl_mod_info->modifier) ? + image->planes[plane].aux_usage : ISL_AUX_USAGE_NONE; final_fast_clear = isl_mod_info->supports_clear_color ? final_fast_clear : ANV_FAST_CLEAR_NONE; } @@ -1050,7 +1052,7 @@ transition_color_buffer(struct anv_cmd_buffer *cmd_buffer, if (image->planes[plane].aux_surface.memory_range.binding == ANV_IMAGE_MEMORY_BINDING_PRIVATE) { - assert(isl_mod_info->aux_usage == ISL_AUX_USAGE_NONE); + assert(!isl_drm_modifier_has_aux(isl_mod_info->modifier)); /* The aux surface, like the fast clear state, lives in * a driver-private bo. We must initialize the aux surface for the @@ -1058,7 +1060,7 @@ transition_color_buffer(struct anv_cmd_buffer *cmd_buffer, */ must_init_aux_surface = true; } else { - assert(isl_mod_info->aux_usage != ISL_AUX_USAGE_NONE); + assert(isl_drm_modifier_has_aux(isl_mod_info->modifier)); /* The aux surface, unlike the fast clear state, lives in * application-visible VkDeviceMemory and is shared with the
