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 D7C424D164 for ; Mon, 17 Feb 2025 18:34:02 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D638368C20D; Mon, 17 Feb 2025 20:31:53 +0200 (EET) Received: from vidala.pars.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3AD568C100 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=1739817102; bh=LyM0K8ewF+m8YDlcBwn817k sOMG87/D8F405fLwFR2Q=; b=nmoZQD0bC401l6eVeZx+7yYRlL+l8oXTSQcQ/ZohVXvYDNZS2M x1di6u8E8Az60aafsjXvGYyc+A52aEBqn7OukED0ekhxHYy0jMd506DYRvMk+tQSm1Ejrb5aplV UOJHJMLKhqZq9Zx1FrDvBgYbiQBiLmBXDy4oiwn2FeVCf+3grQNEpkDzE9FgHLO79+JpqCoUbjn tlAglIE+HZkKiGqVtEzB5/K3FSrNXi4qdqBe7lHfwIAE6MnKqEhhJLDgX2nqJKk9zQc/q7hpUZA IR98Tb4Ma0Dhw5BrIE9/XRA/FlpD6X4LNZ3YVnohcibnILP5EahH9zhRKM5bv3g/bgQ==; DKIM-Signature: v=1; a=ed25519-sha256; s=202405e; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1739817102; bh=LyM0K8ewF+m8YDlcBwn817k sOMG87/D8F405fLwFR2Q=; b=uDPe/iJwrGao2e77TgnM5pVhUqwPd3wSSn2OxpSKSJC+hO2eQI M/UBf5XtgGEp4KCOwSeJWSrn7CR7Qrvie1BQ==; From: Lynne To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Feb 2025 19:31:20 +0100 Message-ID: <20250217183125.57656-10-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 10/11] blend_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_blend_vulkan.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/libavfilter/vf_blend_vulkan.c b/libavfilter/vf_blend_vulkan.c index 58a8f24d5c..57cf3c696b 100644 --- a/libavfilter/vf_blend_vulkan.c +++ b/libavfilter/vf_blend_vulkan.c @@ -49,7 +49,6 @@ typedef struct BlendVulkanContext { FFVkExecPool e; AVVulkanDeviceQueueFamily *qf; FFVulkanShader shd; - VkSampler sampler; FilterParamsVulkan params[4]; double all_opacity; @@ -149,7 +148,6 @@ static av_cold int init_filter(AVFilterContext *avctx) } 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, "blend", VK_SHADER_STAGE_COMPUTE_BIT, NULL, 0, @@ -159,19 +157,21 @@ static av_cold int init_filter(AVFilterContext *avctx) desc = (FFVulkanDescriptorSetBinding []) { { .name = "top_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 = "bottom_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", @@ -204,8 +204,8 @@ static av_cold int init_filter(AVFilterContext *avctx) GLSLC(0, ); GLSLF(1, size = imageSize(output_images[%i]); ,i); GLSLC(1, if (IS_WITHIN(pos, size)) { ); - GLSLF(2, const vec4 top = texture(top_images[%i], pos); ,i); - GLSLF(2, const vec4 bottom = texture(bottom_images[%i], pos); ,i); + GLSLF(2, const vec4 top = imageLoad(top_images[%i], pos); ,i); + GLSLF(2, const vec4 bottom = imageLoad(bottom_images[%i], pos); ,i); GLSLF(2, const float opacity = %f; ,s->params[i].opacity); GLSLF(2, vec4 dst = %s(top, bottom, opacity); ,s->params[i].blend); GLSLC(0, ); @@ -264,7 +264,7 @@ static int blend_frame(FFFrameSync *fs) RET(ff_vk_filter_process_Nin(&s->vkctx, &s->e, &s->shd, out, (AVFrame *[]){ top, bottom }, 2, - s->sampler, NULL, 0)); + VK_NULL_HANDLE, NULL, 0)); return ff_filter_frame(outlink, out); @@ -286,15 +286,10 @@ static av_cold void uninit(AVFilterContext *avctx) { BlendVulkanContext *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); 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".