virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avgblur_vulkan: port to imageLoad()

Browse Source
This commit is contained in:
Lynne
2025-02-17 18:51:27 +01:00
parent 779763181f
commit 389fb36f92
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libavfilter/vf_avgblur_vulkan.c
View File

@ -32,7 +32,6 @@ typedef struct AvgBlurVulkanContext {
int initialized;
FFVkExecPool e;
AVVulkanDeviceQueueFamily *qf;
VkSampler sampler;
FFVulkanShader shd;
/* Push constants / options */
@ -52,7 +51,7 @@ static const char blur_kernel[] = {
C(1, vec4 sum = vec4(0); )
C(1, for (int y = -filter_len.y; y <= filter_len.y; y++) )
C(1, for (int x = -filter_len.x; x <= filter_len.x; x++) )
C(2, sum += texture(input_img[idx], pos + ivec2(x, y)); )
C(2, sum += imageLoad(input_img[idx], pos + ivec2(x, y)); )
C(0, )
C(1, imageStore(output_img[idx], pos, sum * filter_norm); )
C(0, } )
@ -85,7 +84,6 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in)
}
RET(ff_vk_exec_pool_init(vkctx, s->qf, &s->e, s->qf->num*4, 0, 0, 0, NULL));
RET(ff_vk_init_sampler(vkctx, &s->sampler, 1, VK_FILTER_LINEAR));
RET(ff_vk_shader_init(vkctx, &s->shd, "avgblur",
VK_SHADER_STAGE_COMPUTE_BIT,
NULL, 0,
@ -96,11 +94,12 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in)
desc = (FFVulkanDescriptorSetBinding []) {
{
.name = "input_img",
.type = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
.type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
.mem_layout = ff_vk_shader_rep_fmt(s->vkctx.input_format, FF_VK_REP_FLOAT),
.mem_quali = "readonly",
.dimensions = 2,
.elems = planes,
.stages = VK_SHADER_STAGE_COMPUTE_BIT,
.samplers = DUP_SAMPLER(s->sampler),
},
{
.name = "output_img",
@ -137,7 +136,7 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in)
if (s->planes & (1 << i)) {
GLSLF(1, distort(pos, %i); ,i);
} else {
GLSLF(1, vec4 res = texture(input_img[%i], pos); ,i);
GLSLF(1, vec4 res = imageLoad(input_img[%i], pos); ,i);
GLSLF(1, imageStore(output_img[%i], pos, res); ,i);
}
}
@ -186,7 +185,8 @@ static int avgblur_vulkan_filter_frame(AVFilterLink *link, AVFrame *in)
RET(init_filter(ctx, in));
RET(ff_vk_filter_process_simple(&s->vkctx, &s->e, &s->shd,
out, in, s->sampler, &s->opts, sizeof(s->opts)));
out, in, VK_NULL_HANDLE,
&s->opts, sizeof(s->opts)));
err = av_frame_copy_props(out, in);
if (err < 0)
@ -206,15 +206,10 @@ static void avgblur_vulkan_uninit(AVFilterContext *avctx)
{
AvgBlurVulkanContext *s = avctx->priv;
FFVulkanContext *vkctx = &s->vkctx;
FFVulkanFunctions *vk = &vkctx->vkfn;
ff_vk_exec_pool_free(vkctx, &s->e);
ff_vk_shader_free(vkctx, &s->shd);
if (s->sampler)
vk->DestroySampler(vkctx->hwctx->act_dev, s->sampler,
vkctx->hwctx->alloc);
ff_vk_uninit(&s->vkctx);
s->initialized = 0;