anv: Change a parameter of the implicit layout fn

Replace the create_info parameter with isl_extra_usage_flags to more closely
match the parameters of explicit layout function.

Tested-by: Philip Langdale <philipl@overt.org>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15181>
This commit is contained in:
Nanley Chery 2022-02-24 17:17:49 -08:00 committed by Marge Bot
parent c3eee6327c
commit 8d2b7e558b

View file

@ -1073,12 +1073,9 @@ add_all_surfaces_implicit_layout(
const VkImageFormatListCreateInfo *format_list_info,
uint32_t stride,
isl_tiling_flags_t isl_tiling_flags,
const struct anv_image_create_info *create_info)
isl_surf_usage_flags_t isl_extra_usage_flags)
{
assert(create_info);
const struct intel_device_info *devinfo = &device->info;
isl_surf_usage_flags_t isl_extra_usage_flags =
create_info->isl_extra_usage_flags;
VkResult result;
u_foreach_bit(b, image->vk.aspects) {
@ -1380,7 +1377,7 @@ anv_image_init(struct anv_device *device, struct anv_image *image,
} else {
r = add_all_surfaces_implicit_layout(device, image, fmt_list, 0,
isl_tiling_flags,
create_info);
create_info->isl_extra_usage_flags);
}
if (r != VK_SUCCESS)
@ -1557,13 +1554,9 @@ resolve_ahw_image(struct anv_device *device,
uint32_t stride = desc.stride *
(isl_format_get_layout(isl_fmt)->bpb / 8);
struct anv_image_create_info create_info = {
.isl_extra_usage_flags = ISL_SURF_USAGE_DISABLE_AUX_BIT,
};
result = add_all_surfaces_implicit_layout(device, image, NULL, stride,
isl_tiling_flags,
&create_info);
ISL_SURF_USAGE_DISABLE_AUX_BIT);
assert(result == VK_SUCCESS);
#endif
}