fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-08 06:20:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

anv: Handle explicit surface layout of DG2_RC_CCS

Browse source 
We're going to enable the DG2 modifier. Account for the reduced plane
count that exists with it.

Also add an assert to make it clearer that the aux in use is CCS.
Otherwise, it may not be obvious because of the generic compression
names being used here.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24120>
This commit is contained in:
Nanley Chery 2023-05-04 14:10:18 -07:00 • committed by Marge Bot
parent 47565d31e1
commit f2dab434d8
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/intel/vulkan/anv_image.c
View file

@ -1198,10 +1198,10 @@ add_all_surfaces_explicit_layout(
/* We support a restricted set of images with modifiers.
*
* With aux usage,
* With aux usage on platforms without flat-CCS,
* - Format plane count must be 1.
* - Memory plane count must be 2.
* Without aux usage,
* Otherwise,
* - Each format plane must map to a distint memory plane.
*
* For the other cases, currently there is no way to properly map memory
@ -1213,7 +1213,7 @@ add_all_surfaces_explicit_layout(
else
assert(!(image->vk.aspects & ~VK_IMAGE_ASPECT_PLANES_BITS_ANV));
if (mod_has_aux)
if (mod_has_aux && !devinfo->has_flat_ccs)
assert(image->n_planes == 1 && mod_plane_count == 2);
else
assert(image->n_planes == mod_plane_count);
@ -1253,7 +1253,15 @@ add_all_surfaces_explicit_layout(
return result;
if (mod_has_aux) {
const VkSubresourceLayout *aux_layout = &drm_info->pPlaneLayouts[1];
assert(!isl_drm_modifier_get_info(
drm_info->drmFormatModifier)->supports_clear_color);
const VkSubresourceLayout flat_ccs_layout = {
.offset = ANV_OFFSET_IMPLICIT,
};
const VkSubresourceLayout *aux_layout = devinfo->has_flat_ccs ?
&flat_ccs_layout : &drm_info->pPlaneLayouts[1];
result = add_aux_surface_if_supported(device, image, plane,
format_plane,
format_list_info,
@ -1262,6 +1270,8 @@ add_all_surfaces_explicit_layout(
isl_extra_usage_flags);
if (result != VK_SUCCESS)
return result;
assert(isl_aux_usage_has_ccs(image->planes[plane].aux_usage));
}
}