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

vulkan: Remove asserts that weren't valid for RADV ETC2 emulation.

Browse source 
Wasn't caught when radv was modified to use these helpers ...

Tried to move the aspects assert so it still checks application inputs.

Fixes: d9048e31a0 ("radv: Use vk_image_view as the base for radv_image_view")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19914>
This commit is contained in:
Bas Nieuwenhuizen 2022-11-22 00:07:43 +01:00 • committed by Marge Bot
parent eab61863c0
commit 13d755441c
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/vulkan/runtime/vk_image.c
View file

@ -187,8 +187,6 @@ VkImageUsageFlags
vk_image_usage(const struct vk_image *image,
VkImageAspectFlags aspect_mask)
{
assert(!(aspect_mask & ~image->aspects));
/* From the Vulkan 1.2.131 spec:
*
* "If the image was has a depth-stencil format and was created with
@ -371,23 +369,14 @@ vk_image_view_init(struct vk_device *device,
const VkImageSubresourceRange *range = &pCreateInfo->subresourceRange;
if (driver_internal) {
/* For driver internal images, all we require is that the block sizes
* match. Otherwise, we trust the driver to use a format it knows what
* to do with. Combined depth/stencil images might not match if the
* driver only cares about one of the two aspects.
*/
if (image->aspects == VK_IMAGE_ASPECT_COLOR_BIT ||
image->aspects == VK_IMAGE_ASPECT_DEPTH_BIT ||
image->aspects == VK_IMAGE_ASPECT_STENCIL_BIT) {
assert(vk_format_get_blocksize(image->format) ==
vk_format_get_blocksize(image_view->format));
}
image_view->aspects = range->aspectMask;
image_view->view_format = pCreateInfo->format;
} else {
image_view->aspects =
vk_image_expand_aspect_mask(image, range->aspectMask);
assert(!(image_view->aspects & ~image->aspects));
/* From the Vulkan 1.2.184 spec:
*
* "If the image has a multi-planar format and