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 EA05441145 for ; Mon, 17 Feb 2025 18:34:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4949968C237; Mon, 17 Feb 2025 20:33:21 +0200 (EET) Received: from vidala.pars.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5916D68C0F5 for ; Mon, 17 Feb 2025 20:33:14 +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=1739817185; bh=JGFXG2AmeEurozE6w/I/5Is SuGVTFQrXb5ak9p4LZsE=; b=D42FJD2h1cvHeXPRS6ZiZJ/9fP+xBcnVd7xFftcqHD3o5eYovn iHmPLE73hPEyB2YgrGu/eJl4CQllHYhEsU8h/T/uc0vPFUYguA4yMSlqFOZeTrsUnUg8ziDhhIS sdLulrKu9n6v2aj3Ew/xqHfWjU6tt3HCnLrWMfMNFv8/gaWfPPkmzuGdNgKjO7zb/OZLwmf00FI EJUpaxh8b8h3glk32eNxtrfdzItCVMHGTYOAqKcwuhpOsPU/AMrORmQ69m1fd+l9KqAqTIPAGbm M8wC/+cih/zx0TmBO+yf7Tr2dO/lvRCTp6fVyMpAQ7KrO60ZfuBUYr2OtbN7XmEkEWg==; DKIM-Signature: v=1; a=ed25519-sha256; s=202405e; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1739817185; bh=JGFXG2AmeEurozE6w/I/5Is SuGVTFQrXb5ak9p4LZsE=; b=E6Rro0YJfK0DABd+0BHuYAnjq0ladNXceFY1KV874qoS3fau6P G1AfCBVLKLAa+ujlmIYwOCVqlFvfub71OdAQ==; From: Lynne To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Feb 2025 19:32:57 +0100 Message-ID: <20250217183303.57786-1-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 11/11] overlay_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_overlay_vulkan.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/libavfilter/vf_overlay_vulkan.c b/libavfilter/vf_overlay_vulkan.c index 7d5c201cb5..3c6fb96014 100644 --- a/libavfilter/vf_overlay_vulkan.c +++ b/libavfilter/vf_overlay_vulkan.c @@ -35,7 +35,6 @@ typedef struct OverlayVulkanContext { FFVkExecPool e; AVVulkanDeviceQueueFamily *qf; FFVulkanShader shd; - VkSampler sampler; /* Push constants / options */ struct { @@ -55,10 +54,10 @@ static const char overlay_noalpha[] = { C(1, if ((o_offset[i].x <= pos.x) && (o_offset[i].y <= pos.y) && (pos.x < (o_offset[i].x + o_size[i].x)) && (pos.y < (o_offset[i].y + o_size[i].y))) { ) - C(2, vec4 res = texture(overlay_img[i], pos - o_offset[i]); ) + C(2, vec4 res = imageLoad(overlay_img[i], pos - o_offset[i]); ) C(2, imageStore(output_img[i], pos, res); ) C(1, } else { ) - C(2, vec4 res = texture(main_img[i], pos); ) + C(2, vec4 res = imageLoad(main_img[i], pos); ) C(2, imageStore(output_img[i], pos, res); ) C(1, } ) C(0, } ) @@ -67,11 +66,11 @@ static const char overlay_noalpha[] = { static const char overlay_alpha[] = { C(0, void overlay_alpha_opaque(int i, ivec2 pos) ) C(0, { ) - C(1, vec4 res = texture(main_img[i], pos); ) + C(1, vec4 res = imageLoad(main_img[i], pos); ) C(1, if ((o_offset[i].x <= pos.x) && (o_offset[i].y <= pos.y) && (pos.x < (o_offset[i].x + o_size[i].x)) && (pos.y < (o_offset[i].y + o_size[i].y))) { ) - C(2, vec4 ovr = texture(overlay_img[i], pos - o_offset[i]); ) + C(2, vec4 ovr = imageLoad(overlay_img[i], pos - o_offset[i]); ) C(2, res = ovr * ovr.a + res * (1.0f - ovr.a); ) C(2, res.a = 1.0f; ) C(2, imageStore(output_img[i], pos, res); ) @@ -109,7 +108,6 @@ static av_cold int init_filter(AVFilterContext *ctx) } 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_NEAREST)); RET(ff_vk_shader_init(vkctx, &s->shd, "overlay", VK_SHADER_STAGE_COMPUTE_BIT, NULL, 0, @@ -128,19 +126,21 @@ static av_cold int init_filter(AVFilterContext *ctx) desc = (FFVulkanDescriptorSetBinding []) { { .name = "main_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 = "overlay_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", @@ -240,7 +240,7 @@ static int overlay_vulkan_blend(FFFrameSync *fs) RET(ff_vk_filter_process_Nin(&s->vkctx, &s->e, &s->shd, out, (AVFrame *[]){ input_main, input_overlay }, 2, - s->sampler, &s->opts, sizeof(s->opts))); + VK_NULL_HANDLE, &s->opts, sizeof(s->opts))); err = av_frame_copy_props(out, input_main); if (err < 0) @@ -295,10 +295,6 @@ static void overlay_vulkan_uninit(AVFilterContext *avctx) 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); ff_framesync_uninit(&s->fs); -- 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".