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

vk/image: fix view creation for planar video aspects

Browse source 
drivers do implement this

cc: mesa-stable

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31318>
(cherry picked from commit c4d6d9254a)
This commit is contained in:
Mike Blumenkrantz 2024-07-10 11:18:38 -04:00 • committed by Eric Engestrom
parent dbee14f095
commit 417370b360
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -254,7 +254,7 @@
"description": "vk/image: fix view creation for planar video aspects",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

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

@ -441,6 +441,12 @@ vk_image_view_init(struct vk_device *device,
vk_image_expand_aspect_mask(image, range->aspectMask);
assert(!(image_view->aspects & ~image->aspects));
const VkImageUsageFlags video = VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR |
VK_IMAGE_USAGE_VIDEO_DECODE_SRC_BIT_KHR |
VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR |
VK_IMAGE_USAGE_VIDEO_ENCODE_DST_BIT_KHR |
VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR |
VK_IMAGE_USAGE_VIDEO_ENCODE_DPB_BIT_KHR;
/* From the Vulkan 1.2.184 spec:
*
@ -456,11 +462,10 @@ vk_image_view_init(struct vk_device *device,
* be identical to the image format, and the sampler to be used with the
* image view must enable sampler Y′CBCR conversion."
*
* Since no one implements video yet, we can ignore the bits about video
* create flags and assume YCbCr formats match.
*/
if ((image->aspects & VK_IMAGE_ASPECT_PLANE_1_BIT) &&
(range->aspectMask == VK_IMAGE_ASPECT_COLOR_BIT))
(range->aspectMask == VK_IMAGE_ASPECT_COLOR_BIT) &&
!(image->usage & video))
assert(image_view->format == image->format);
/* From the Vulkan 1.2.184 spec: