Commit 3a2977e7 authored by Jason Ekstrand's avatar Jason Ekstrand Committed by Marge Bot
Browse files

anv: Reject modifiers on depth/stencil formats

67903973

 added code which attempts to reject modifiers on
depth/stencil formats but it was placed after the early return for depth
and stencil aspects.  This commit moves it up so it actually works.

Of course, this doesn't actually matter because the only user of any of
the modifiers stuff is the WSI code and it will never do anything with
depth/stencil.
Reviewed-by: Lionel Landwerlin's avatarLionel Landwerlin <lionel.g.landwerlin@intel.com>
Tested-by: Marge Bot <mesa/mesa!3794>
Part-of: <mesa/mesa!3794>
parent 5a593bec
Pipeline #108185 passed with stages
in 21 minutes
......@@ -459,6 +459,13 @@ anv_get_format_plane(const struct gen_device_info *devinfo, VkFormat vk_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 (tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT)
return unsupported;
return plane_format;
}
......@@ -480,9 +487,6 @@ anv_get_format_plane(const struct gen_device_info *devinfo, VkFormat vk_format,
if (!util_is_power_of_two_or_zero(isl_layout->bpb))
return unsupported;
if (vk_format_is_depth_or_stencil(vk_format))
return unsupported;
if (isl_format_is_compressed(plane_format.isl_format))
return unsupported;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment