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 2AA904D164 for ; Mon, 17 Feb 2025 18:33:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1AF0768C0D9; Mon, 17 Feb 2025 20:31:48 +0200 (EET) Received: from vidala.pars.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C54768C0DB 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=jCqKC7qGc+leHS1zkDFObir uvFkbG5knCkDryY0Ekt8=; b=HdryUw2H+yaR7qrFYA4NpBsbUyMwTt8Y+zBk/mmB51i8KTFeVM QYEXLVOdw9IbmmKWsKVZgIlL5YkRfHpPBpgrA5zf/iCTwv9XzRklRf6sZo9Cg1MrLJDY2N8BFDD ZEZeviisysYXMfaYe7op/Iu0K85ppuUZh7pMz0Bv8eR/z6F2wx8oJtEhHEsK7Q6ZRrdTmpTmoSy JKAF7JKAq1V5SSz59WaBZF1MAwCBr1vKBqR5NEGQB7KbfP7OpksotGOIPRd826Tti8M3WAxFA5z DaejoNcyk4/oPuXZ0fZLOG062hIA6fUSvHf4IFhpaOwtefo28jYRTJ4QJZ/a9rj+Yzg==; 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=jCqKC7qGc+leHS1zkDFObir uvFkbG5knCkDryY0Ekt8=; b=OPq1DIFDVEIyEoAIjLyLMjFQt94O6qAZXmQsDcIgvDxbDAPEvW mYCcvexzyzG3oQqtesxcc3emsJda7WlaXEAw==; From: Lynne To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Feb 2025 19:31:18 +0100 Message-ID: <20250217183125.57656-8-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 08/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 | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/libavfilter/vf_gblur_vulkan.c b/libavfilter/vf_gblur_vulkan.c index 101c8ffd8c..bc4c2217b5 100644 --- a/libavfilter/vf_gblur_vulkan.c +++ b/libavfilter/vf_gblur_vulkan.c @@ -51,17 +51,17 @@ typedef struct GBlurVulkanContext { } GBlurVulkanContext; static const char gblur_func[] = { - C(0, void gblur(const ivec2 pos, const int index) ) - C(0, { ) + C(0, void gblur(const ivec2 pos, const int index) ) + C(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(0, ) + C(1, for(int i = 1; i < kernel.length(); 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); ) - C(0, } ) + C(1, } ) + C(0, ) + C(1, imageStore(output_images[index], pos, sum); ) + C(0, } ) }; static inline float gaussian(float sigma, float x) @@ -254,7 +254,7 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in) RET(ff_vk_shader_add_descriptor_set(vkctx, shd, desc, 2, 0, 0)); - GLSLC(0, #define OFFSET (vec2(i, 0.0))); + GLSLC(0, #define OFFSET (ivec2(i, 0.0))); RET(init_gblur_pipeline(s, shd, &s->params_hor, s->size, s->sigma, spv)); } @@ -268,7 +268,7 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in) RET(ff_vk_shader_add_descriptor_set(vkctx, shd, desc, 2, 0, 0)); - GLSLC(0, #define OFFSET (vec2(0.0, i))); + GLSLC(0, #define OFFSET (ivec2(0.0, i))); RET(init_gblur_pipeline(s, shd, &s->params_ver, s->sizeV, s->sigmaV, spv)); } @@ -285,7 +285,6 @@ static av_cold void gblur_vulkan_uninit(AVFilterContext *avctx) { GBlurVulkanContext *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_hor); -- 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".