From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 70C61429CB for ; Mon, 17 Feb 2025 18:32:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2AC9468C181; Mon, 17 Feb 2025 20:31:44 +0200 (EET) Received: from vidala.pars.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71D8D68C054 for ; Mon, 17 Feb 2025 20:31:41 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; s=202405r; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1739817101; bh=2tIIcHKCdVKM3x2CDR/YJQk ZZSLKFRg6MJz4gtGYLNY=; b=PKL3sZv6z1uK+JQbY+fkTZEXQh4n4u92opXCgbM0wZuxuDkRg4 m5dvNipWqKeckFnrWD6q2prIX3cPcr3JFDNDHGkFmtIuq7QA2Cw6EbGQsLX+2rKebk/+OjC0OiM I3Nw7OipxgcMBSlnB6hC1InUJ414gjo2z6MeP5KHbrAidTPIYHIGjzq+noHQR56TBgSUmq1vMBP sACvCw1AwSGwqpwImNtukDiXpspR4TOnTD28X7vtr5QTBvxiw3IMXtdjr57yEjSUTPwguaYXuIi LnOIgLfSsvzaGvaCjU953MNoXk0RtstFBqNngBKM9NRCYFkjZkopUis+tR4EvMQeWjg==; DKIM-Signature: v=1; a=ed25519-sha256; s=202405e; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1739817101; bh=2tIIcHKCdVKM3x2CDR/YJQk ZZSLKFRg6MJz4gtGYLNY=; b=qGFYH//HRkO+ToExZ2B573W2sXIsJGHXnBQY2HKaov9qzl2C82 tACKYW3QD5kUGfF9hXyoC87/y96aqWwst5Aw==; From: Lynne To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Feb 2025 19:31:14 +0100 Message-ID: <20250217183125.57656-4-dev@lynne.ee> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250217183125.57656-1-dev@lynne.ee> References: <20250217183125.57656-1-dev@lynne.ee> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/11] avgblur_vulkan: port to imageLoad() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Lynne Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- libavfilter/vf_avgblur_vulkan.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/libavfilter/vf_avgblur_vulkan.c b/libavfilter/vf_avgblur_vulkan.c index e291d5d8e9..5a7012531b 100644 --- a/libavfilter/vf_avgblur_vulkan.c +++ b/libavfilter/vf_avgblur_vulkan.c @@ -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; -- 2.47.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".