fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-23 22:40:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

anv: Rework depth/stencil early return in anv_get_format_plane

Browse source 
The comment about modifiers is bogus because we check the modifier
before this check and return early.  Also, there's no reason why we need
to check the requested aspect when we could check the format itself.
anv_image_aspect_to_plane will ensure that the requested aspect is one
that actually exists.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12141>
This commit is contained in:
Jason Ekstrand 2021-07-30 06:42:33 -05:00 • committed by Marge Bot
parent 4518ae8284
commit dc6794ec24
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/intel/vulkan/anv_formats.c
View file

@ -488,15 +488,8 @@ anv_get_format_aspect(const struct intel_device_info *devinfo,
if (tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT)
return plane_format;
if (aspect & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) {
assert(vk_format_aspects(vk_format) &
(VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT));
/* There's no reason why we strictly can't support depth or stencil with
* modifiers but there's also no reason why we should.
*/
if (vk_format_is_depth_or_stencil(vk_format))
return plane_format;
}
assert((aspect & ~VK_IMAGE_ASPECT_ANY_COLOR_BIT_ANV) == 0);