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 811F94D168 for ; Mon, 17 Feb 2025 18:32:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C1D8368C1B5; Mon, 17 Feb 2025 20:31:46 +0200 (EET) Received: from vidala.pars.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 793BB68C0D9 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=HJzDZXyhi5gx8yrOyUsqznO NipZ6lPJrQaPK0ogqbDc=; b=DZCIt8zOYp2HOoMvEQ/X145N6AO5lJYWRb6dHu55PeW7APuGXS mO23FH7pzHo9oFGL6ebX2ETqrKynQ2YiZ9+lgg6OGOpgGzgO7S4TyDPGMWcUcg/zk91xeEdjUUE xLtis63fZ0c+XaWvTT6pHekPBssh22pB6dCZ7kCduJZ0TAdniEKYbdrS75mCwV9Jj+X8l2PxY59 Jvjn4BFXCDt6SMBO4iRYs5CSESqtpDXnEUmVXusj3nvcx4xJX3N6jA3T59W54tpLC9xgwfAS7+o L5Y6CBHhFmcLJxu0C+4aKGmOUov+VGZBf6A5GduZOnumxnOzU/ExTJvE/r1dc2pH1Ig==; 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=HJzDZXyhi5gx8yrOyUsqznO NipZ6lPJrQaPK0ogqbDc=; b=3MwQ4jmPrxVt2hcA41+BVHulP2ooV+lZhrOGBtZBfsh4QmNyAt 8RvQL6gy79Q/vYlPkxbfqJGjzgEFwcSeFdBg==; From: Lynne To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Feb 2025 19:31:16 +0100 Message-ID: <20250217183125.57656-6-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 06/11] flip_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_flip_vulkan.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/libavfilter/vf_flip_vulkan.c b/libavfilter/vf_flip_vulkan.c index 2cf793cfe8..3e2aed0fda 100644 --- a/libavfilter/vf_flip_vulkan.c +++ b/libavfilter/vf_flip_vulkan.c @@ -40,7 +40,6 @@ typedef struct FlipVulkanContext { FFVkExecPool e; AVVulkanDeviceQueueFamily *qf; FFVulkanShader shd; - VkSampler sampler; } FlipVulkanContext; static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in, enum FlipType type) @@ -70,7 +69,6 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in, enum FlipType } 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, "flip", VK_SHADER_STAGE_COMPUTE_BIT, NULL, 0, @@ -80,11 +78,12 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in, enum FlipType desc = (FFVulkanDescriptorSetBinding []) { { .name = "input_image", - .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_image", @@ -110,16 +109,16 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in, enum FlipType switch (type) { case FLIP_HORIZONTAL: - GLSLF(2, vec4 res = texture(input_image[%i], ivec2(size.x - pos.x, pos.y)); ,i); + GLSLF(2, vec4 res = imageLoad(input_image[%i], ivec2(size.x - pos.x, pos.y)); ,i); break; case FLIP_VERTICAL: - GLSLF(2, vec4 res = texture(input_image[%i], ivec2(pos.x, size.y - pos.y)); ,i); + GLSLF(2, vec4 res = imageLoad(input_image[%i], ivec2(pos.x, size.y - pos.y)); ,i); break; case FLIP_BOTH: - GLSLF(2, vec4 res = texture(input_image[%i], ivec2(size.xy - pos.xy));, i); + GLSLF(2, vec4 res = imageLoad(input_image[%i], ivec2(size.xy - pos.xy));, i); break; default: - GLSLF(2, vec4 res = texture(input_image[%i], pos); ,i); + GLSLF(2, vec4 res = imageLoad(input_image[%i], pos); ,i); break; } GLSLF(2, imageStore(output_image[%i], pos, res); ,i); @@ -147,17 +146,11 @@ fail: static av_cold void flip_vulkan_uninit(AVFilterContext *avctx) { FlipVulkanContext *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; @@ -181,7 +174,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in, enum FlipType type) RET(init_filter(ctx, in, type)); 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)); -- 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".