From 70864e6adba636daf4551ba9e65a19eeb93bced1 Mon Sep 17 00:00:00 2001 From: Lynne Date: Wed, 25 Oct 2023 21:56:03 +0200 Subject: [PATCH] vulkan_decode: correct flipped condition in image layout Changed by the previous commit. Caused validation issues on hardware with !reuse_dpb_dst but not layered_dpb. --- libavcodec/vulkan_decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vulkan_decode.c b/libavcodec/vulkan_decode.c index 7f575d1283..a89d84fcaa 100644 --- a/libavcodec/vulkan_decode.c +++ b/libavcodec/vulkan_decode.c @@ -449,7 +449,7 @@ int ff_vk_decode_frame(AVCodecContext *avctx, .srcAccessMask = VK_ACCESS_2_NONE, .dstAccessMask = VK_ACCESS_2_VIDEO_DECODE_WRITE_BIT_KHR, .oldLayout = vkf->layout[0], - .newLayout = (dec->layered_dpb && vp->dpb_frame) ? + .newLayout = (dec->layered_dpb || vp->dpb_frame) ? VK_IMAGE_LAYOUT_VIDEO_DECODE_DST_KHR : VK_IMAGE_LAYOUT_VIDEO_DECODE_DPB_KHR, /* Spec, 07252 utter madness */ .srcQueueFamilyIndex = vkf->queue_family[0],