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 4623143D2C for ; Mon, 17 Feb 2025 18:33:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A82AF68C1F2; Mon, 17 Feb 2025 20:31:50 +0200 (EET) Received: from vidala.pars.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 81F6168C0E9 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=p13kZxZ2AUOthXMUm2CtUEc +fhRSVzLnQeRSvstAYE4=; b=V3fj73w0H/+zb1IUEKax5N95DX6efjccqmzzWQs3xe0rED3rwm zw4shHUsFnrps1UNoa+VOBT7VCOguK/c+0fNgRxECWgwmhlJtlBqjTY7ryPaGcHqSHQSsHcCcNX 69ZoFptn0GH2NX+Vg26IsOSDKyyeMOyIwooC/F3SdfmJJiENWIlbjhajlouPgdyu4Aar9+IC+qs hPK210UyuqZNdgKqGVSm7jxNI3jvQQ00mbA7DL6XyMS1xq5WVfacX/C0nuy138Lf1EaQysg/FKO BtJfD9VVlPhK8Y3nt28j13l92nwOVvdjbcQeb5FemqJ+MKjCXzDk3u4IP1+qxjFQnRg==; 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=p13kZxZ2AUOthXMUm2CtUEc +fhRSVzLnQeRSvstAYE4=; b=8Pj3pa+Q/vd7FZAIjfQgUoiakA8/GgZYphRFP6qzIsQInVO7es yaoYhaHrjyUm3t5Thr0YJ2Cga7n7On2RCEDg==; From: Lynne To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Feb 2025 19:31:19 +0100 Message-ID: <20250217183125.57656-9-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 09/11] transpose_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_transpose_vulkan.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_transpose_vulkan.c b/libavfilter/vf_transpose_vulkan.c index 0169804fbb..3fe2d11cb2 100644 --- a/libavfilter/vf_transpose_vulkan.c +++ b/libavfilter/vf_transpose_vulkan.c @@ -35,7 +35,6 @@ typedef struct TransposeVulkanContext { FFVkExecPool e; AVVulkanDeviceQueueFamily *qf; FFVulkanShader shd; - VkSampler sampler; int dir; int passthrough; @@ -69,7 +68,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, "transpose", VK_SHADER_STAGE_COMPUTE_BIT, NULL, 0, @@ -79,11 +77,12 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in) 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", @@ -107,13 +106,13 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in) GLSLF(1, size = imageSize(output_images[%i]); ,i); GLSLC(1, if (IS_WITHIN(pos, size)) { ); if (s->dir == TRANSPOSE_CCLOCK) - GLSLF(2, vec4 res = texture(input_images[%i], ivec2(size.y - pos.y, pos.x)); ,i); + GLSLF(2, vec4 res = imageLoad(input_images[%i], ivec2(size.y - pos.y, pos.x)); ,i); else if (s->dir == TRANSPOSE_CLOCK_FLIP || s->dir == TRANSPOSE_CLOCK) { - GLSLF(2, vec4 res = texture(input_images[%i], ivec2(size.yx - pos.yx)); ,i); + GLSLF(2, vec4 res = imageLoad(input_images[%i], ivec2(size.yx - pos.yx)); ,i); if (s->dir == TRANSPOSE_CLOCK) GLSLC(2, pos = ivec2(pos.x, size.y - pos.y); ); } else - GLSLF(2, vec4 res = texture(input_images[%i], pos.yx); ,i); + GLSLF(2, vec4 res = imageLoad(input_images[%i], pos.yx); ,i); GLSLF(2, imageStore(output_images[%i], pos, res); ,i); GLSLC(1, } ); } @@ -157,7 +156,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) RET(init_filter(ctx, in)); RET(ff_vk_filter_process_simple(&s->vkctx, &s->e, &s->shd, out, in, - s->sampler, NULL, 0)); + VK_NULL_HANDLE, NULL, 0)); RET(av_frame_copy_props(out, in)); @@ -182,15 +181,10 @@ static av_cold void transpose_vulkan_uninit(AVFilterContext *avctx) { TransposeVulkanContext *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".