[FFmpeg-devel] [PATCH 55/97] Vulkan patchset part 2 - hwcontext rewrite and filtering

Anton Khirnov anton at khirnov.net
Thu May 11 20:13:29 EEST 2023


Quoting Lynne (2023-05-11 18:47:46)
> May 11, 2023, 18:14 by anton at khirnov.net:
> 
> > Quoting Lynne (2023-04-24 17:56:38)
> >
> >> From 956f043e9f233675856336e028cc8ee7e35c71f5 Mon Sep 17 00:00:00 2001
> >> From: Lynne <dev at lynne.ee>
> >> Date: Wed, 23 Nov 2022 14:04:28 +0100
> >> Subject: [PATCH 38/97] vulkan: lock queues before submitting operations
> >>
> >> ---
> >>  libavutil/vulkan.c | 7 +++++++
> >>  1 file changed, 7 insertions(+)
> >>
> >> diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
> >> index 6bf2c214b7..ad13b8f3cb 100644
> >> --- a/libavutil/vulkan.c
> >> +++ b/libavutil/vulkan.c
> >> @@ -625,7 +625,14 @@ int ff_vk_submit_exec_queue(FFVulkanContext *s, FFVkExecContext *e)
> >>  return AVERROR_EXTERNAL;
> >>  }
> >>  
> >> +    s->hwctx->lock_queue((AVHWDeviceContext *)s->device_ref->data,
> >> +                         e->qf->queue_family, e->qf->cur_queue % e->qf->actual_queues);
> >> +
> >>  ret = vk->QueueSubmit(q->queue, 1, &s_info, q->fence);
> >> +
> >> +    s->hwctx->unlock_queue((AVHWDeviceContext *)s->device_ref->data,
> >> +                           e->qf->queue_family, e->qf->cur_queue % e->qf->actual_queues);
> >> +
> >>
> >
> > Should this patch be right after the one that adds these functions?
> >
> 
> Yes. The patch before added support for them to the hwcontext.
> This patch uses them in vulkan.c, which, at the given position in
> the patchset is still an independent component only used for lavfi.
> I can squash them, but I'd prefer not to, though no strong feelings
> about it.

I'm not asking you to squash it, I'm asking you to reorder it so that it
immediately follows the patch that adds the locking functions, and isn't
ordered 12 patches later for no apparent reason.

-- 
Anton Khirnov


More information about the ffmpeg-devel mailing list