From patchwork Thu Oct 3 05:51:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 51994 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b18c:0:b0:48e:c0f8:d0de with SMTP id q12csp145956vqn; Wed, 2 Oct 2024 22:52:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXQKVfwREgvgBuHjlJqAgD8h2RKa9W6tTusSaKXUeZPXN0oAzELKXju+3Nzz/ziSwbA8g1D0fmHmMlXYs1xkV29@gmail.com X-Google-Smtp-Source: AGHT+IGUwzpxYGdZIMYbgPnP8YeMWNaoD62b6FRFuYH0xOM9wYHkgOuOArrg+s4b7iNFFeXQMcsY X-Received: by 2002:a05:6402:3494:b0:5c8:8381:c17b with SMTP id 4fb4d7f45d1cf-5c8b18ceb32mr1770398a12.2.1727934777859; Wed, 02 Oct 2024 22:52:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727934777; cv=none; d=google.com; s=arc-20240605; b=b5SWAU5Sci+taAaeAQB/awY67rI5ROfH6H416czKTp2cJm31mIjTOYwgn/uoKW+ReM B0NBUmcwrpfj74FyKnWNgFeu/DU1iwujxQ8djrortfFTDKqr7zZacgMwqFrAADgqB2b+ QRRS/wlbCAjoo4OFA6mMzvaRU5xkH9rJd9Ri/GDOlzx4eYKR5u/Wv114X7rcZLfuhpm2 otQEltciatoN5sgEmSnDkwR6kt9oKei6Hdo0AHuAcN28GP403V0Hfy3h2ykM1FhIJ7eP r84S45hXmJ2qNu/AwJi7pCJeItfgstxPWaNgMrCzxSuZxWK3muhyJ9dpnZTTSBAoE38U 0LVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:delivered-to; bh=S2Av7j+C/97ZD/oc0rnIVSdFBp7urkuGVuc0rnDwgJg=; fh=nenT92/WZoU6unXd3J6UhGUdod4piddKfVtctNBOh6k=; b=iZHPc875pZGWrZKM5ikdv8WzU3ATwkinpP98dORTLproSjuhypPPbWz1MdAiA0mhii /nlJNhkFZu/Jpc6xLf58LwjYfsFiRWX2qdTttgihQqKjOrmbFtMAHN1oi8FoB27p05o4 z6PoFGvHHuXwYk+ZR5nUXFG537g/wjEddIDAM7Qa8VyXOu37Z6moEFGWnQhugPhflw50 V26Tb06oe+RoCPb6nDsivqUY4LBJhdyhwgDwO9/pmMdOAYa6lz2KOPdIgD+cZlKiyyIe DeaTzUJtjHo0qiEGtqv8PibXMbpEZQoBhesfv6SxhGM9/lfBowVe7I20gU0Mu3oSKjtD u69A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5c8ca49b1f7si382252a12.436.2024.10.02.22.52.57; Wed, 02 Oct 2024 22:52:57 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CD17468DACD; Thu, 3 Oct 2024 08:51:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vidala.lynne.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F52F68DA40 for ; Thu, 3 Oct 2024 08:51:51 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Oct 2024 07:51:35 +0200 Message-ID: <20241003055141.415483-8-dev@lynne.ee> X-Mailer: git-send-email 2.45.2.753.g447d99e1c3b In-Reply-To: <20241003055141.415483-1-dev@lynne.ee> References: <20241003055141.415483-1-dev@lynne.ee> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 8/8] vulkan: don't enable GL_EXT_buffer_reference by default 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: , X-Patchwork-Original-From: Lynne via ffmpeg-devel From: Lynne Reply-To: FFmpeg development discussions and patches Cc: Lynne Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: tSbdnfdr0hz8 Only nlmeans_vulkan uses it. --- libavfilter/vf_nlmeans_vulkan.c | 6 ++++-- libavutil/vulkan.c | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_nlmeans_vulkan.c b/libavfilter/vf_nlmeans_vulkan.c index 9ad12eb7b6..39460dc194 100644 --- a/libavfilter/vf_nlmeans_vulkan.c +++ b/libavfilter/vf_nlmeans_vulkan.c @@ -240,7 +240,8 @@ static av_cold int init_weights_pipeline(FFVulkanContext *vkctx, FFVkExecPool *e RET(ff_vk_shader_init(vkctx, shd, "nlmeans_weights", VK_SHADER_STAGE_COMPUTE_BIT, - NULL, 0, + (const char *[]) { "GL_EXT_buffer_reference", + "GL_EXT_buffer_reference2" }, 2, wg_size, 1, 1, 0)); @@ -431,7 +432,8 @@ static av_cold int init_denoise_pipeline(FFVulkanContext *vkctx, FFVkExecPool *e RET(ff_vk_shader_init(vkctx, shd, "nlmeans_denoise", VK_SHADER_STAGE_COMPUTE_BIT, - NULL, 0, + (const char *[]) { "GL_EXT_buffer_reference", + "GL_EXT_buffer_reference2" }, 2, 32, 32, 1, 0)); diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c index c6aa6cdd10..46e5cad872 100644 --- a/libavutil/vulkan.c +++ b/libavutil/vulkan.c @@ -1479,8 +1479,6 @@ int ff_vk_shader_init(FFVulkanContext *s, FFVulkanShader *shd, const char *name, GLSLC(0, #define IS_WITHIN(v1, v2) ((v1.x < v2.x) && (v1.y < v2.y)) ); GLSLC(0, ); GLSLC(0, #extension GL_EXT_scalar_block_layout : require ); - GLSLC(0, #extension GL_EXT_buffer_reference : require ); - GLSLC(0, #extension GL_EXT_buffer_reference2 : require ); if (stage == VK_SHADER_STAGE_TASK_BIT_EXT || stage == VK_SHADER_STAGE_MESH_BIT_EXT)