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 0613343D2C for ; Mon, 17 Feb 2025 18:33:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6AFB368C1C5; Mon, 17 Feb 2025 20:31:49 +0200 (EET) Received: from vidala.pars.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8159E68C0E4 for ; Mon, 17 Feb 2025 20:31:42 +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=cDT9bChex9Ox2AJLCdBb3MA YJKR0fF62ByJXP5KhTR0=; b=fJrOJ9RgK7jaC4QaPvk5H4+RT4uVRyxooMqYdX7Q5dpT6HA0iS ODh4Tm2qPwQ7p7I2gKNOFrlFxZdflq2KwwT3TLtfSf1qQbtnfa5Pby1IJ0CcYPGtUmM7DLzeF7x pZmUjMe0W1y0XOwqMe84GC8F9HJS8ogsQemAWmp0gNoUoOrsxzsgVZsfiZyMvvVQvEGWc3nGcmh R6tO83p6ICPAiaz0aevl902nGBN2SPZ/Ng3rie9B5c1wXMfBpYHGBJobzuOEb3hOPUSU3A3KzLq tyIt//ddll+yVtVLOl8DsKDMIqTRsSCLX3johtIFlC+feBtWXHsNEQXVlIR08B5BtFw==; 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=cDT9bChex9Ox2AJLCdBb3MA YJKR0fF62ByJXP5KhTR0=; b=DiVNkcGTOgtLyhao0Wil9zwtx0wRcijUTT9rKrOYIg3LCVJCea oHYpuZ7r7s+QAhsCvN63m/NxQMSh+R8cTvAw==; From: Lynne To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Feb 2025 19:31:17 +0100 Message-ID: <20250217183125.57656-7-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 07/11] gblur_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_gblur_vulkan.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/libavfilter/vf_gblur_vulkan.c b/libavfilter/vf_gblur_vulkan.c index 58251c4a17..101c8ffd8c 100644 --- a/libavfilter/vf_gblur_vulkan.c +++ b/libavfilter/vf_gblur_vulkan.c @@ -53,11 +53,11 @@ typedef struct GBlurVulkanContext { static const char gblur_func[] = { C(0, void gblur(const ivec2 pos, const int index) ) C(0, { ) - C(1, vec4 sum = texture(input_images[index], pos) * kernel[0]; ) + C(1, vec4 sum = imageLoad(input_images[index], pos) * kernel[0]; ) C(0, ) C(1, for(int i = 1; i < kernel.length(); i++) { ) - C(2, sum += texture(input_images[index], pos + OFFSET) * kernel[i]; ) - C(2, sum += texture(input_images[index], pos - OFFSET) * kernel[i]; ) + C(2, sum += imageLoad(input_images[index], pos + OFFSET) * kernel[i]; ) + C(2, sum += imageLoad(input_images[index], pos - OFFSET) * kernel[i]; ) C(1, } ) C(0, ) C(1, imageStore(output_images[index], pos, sum); ) @@ -163,7 +163,7 @@ static int init_gblur_pipeline(GBlurVulkanContext *s, if (s->planes & (1 << i)) { GLSLF(1, gblur(pos, %i); ,i); } else { - GLSLF(1, vec4 res = texture(input_images[%i], pos); ,i); + GLSLF(1, vec4 res = imageLoad(input_images[%i], pos); ,i); GLSLF(1, imageStore(output_images[%i], pos, res); ,i); } } @@ -220,16 +220,16 @@ 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)); desc = (FFVulkanDescriptorSetBinding []) { { .name = "input_images", - .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_images", @@ -293,10 +293,6 @@ static av_cold void gblur_vulkan_uninit(AVFilterContext *avctx) ff_vk_free_buf(vkctx, &s->params_hor); ff_vk_free_buf(vkctx, &s->params_ver); - if (s->sampler) - vk->DestroySampler(vkctx->hwctx->act_dev, s->sampler, - vkctx->hwctx->alloc); - ff_vk_uninit(&s->vkctx); s->initialized = 0; @@ -327,7 +323,7 @@ static int gblur_vulkan_filter_frame(AVFilterLink *link, AVFrame *in) RET(ff_vk_filter_process_2pass(&s->vkctx, &s->e, (FFVulkanShader *[2]){ &s->shd_hor, &s->shd_ver }, - out, tmp, in, s->sampler, NULL, 0)); + out, tmp, in, VK_NULL_HANDLE, NULL, 0)); err = av_frame_copy_props(out, in); if (err < 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".