From patchwork Thu Oct 3 05:51:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 51995 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b18c:0:b0:48e:c0f8:d0de with SMTP id q12csp147502vqn; Wed, 2 Oct 2024 22:59:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXYaieHpvADMA1TXPPZ6zOgQf3Yx0Cg1+pwNfO/kWz5UHoUr2CJlJExJqLEfwYMPPwkh9TliTU7yCXdg/EPK2XR@gmail.com X-Google-Smtp-Source: AGHT+IGfmzmfhPBYbYskDR7oDb9sIVMKh5nLTb207nWwOzK24l0ci6NnjvIJGrHO+f/4rsjMewOA X-Received: by 2002:a05:6402:1d4e:b0:5c8:a01f:bf8b with SMTP id 4fb4d7f45d1cf-5c8b1924451mr4163650a12.11.1727935144340; Wed, 02 Oct 2024 22:59:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727935144; cv=none; d=google.com; s=arc-20240605; b=M79+kXPRiC9Y/81JPDD6iTqNcFxX58xD+yiL7ieouR9dUDpGHzQxh3jNFNyLAV45T8 jDve2kFNX0rmIKaJE2u8sGoto0ZwgtszwRNQ8WxwNcIpwNTL6OwZeM8+7z7CNvSpL/zn xxPcTJl0wrU3TbCr3sVJc8MQa9GMWycty8M54bf/yZEMamjOuPmnLXz+fu3JFNM1eUvs cavWxNxrqcaymVqqUqWAYCGa8t8Jz7xj7hTGc5e4DUObqNMJzhBqCQLmGgZ0lUNnmLm9 H/4+WL/XlCr+MVp5+Fw//KOVGndomNQYFpG8GRBYmojepKl31Ipnm97MYCmUAhwmOuLI OWVg== 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=vrY+1dWluYhbvxLYUnKaZhu1yRpXq4nYGCh+hORWKQk=; fh=nenT92/WZoU6unXd3J6UhGUdod4piddKfVtctNBOh6k=; b=Gc6BUFsNRaiL1ULrjOSr+jNE0qvi3YhblObOjFUiZJD730c/9TkLE8fYYqSJDD3JzE jAmPNelcK4/WnZDBh1K1VoFuBdsHZas87qNEnfRjs44xHUjNpaz0gpYOiv6ACvlLBDds o6kxDXS2sIm8FKKRTF8hxh8Z5+ZOnpSDl76b/e3fupoK7KccElkeGjwmcCT60V0Jz3G3 KDMPi03gAYNfvB5Y10rBZfzqRObTIUJCND6qHjgTKdGJPsDfw1KhQ11EJhUpQIgjfn6r nprjJ3Vd8cnG1HbiXiceSHfg/y+ni/saYSq5yhL5Bn8s2y6tCb55cB7lU+Z7+J2tE7HQ LrYQ==; 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-5c8ca481114si392855a12.327.2024.10.02.22.59.03; Wed, 02 Oct 2024 22:59:04 -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 58A9D68DAE2; Thu, 3 Oct 2024 08:51:59 +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 5BCBC68DA3B for ; Thu, 3 Oct 2024 08:51:51 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Oct 2024 07:51:34 +0200 Message-ID: <20241003055141.415483-7-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 7/8] vulkan_shaderc: add more stages, target Vulkan 1.3 and only output debug if needed 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: LSL30YWSc7KS --- libavfilter/vulkan_shaderc.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/libavfilter/vulkan_shaderc.c b/libavfilter/vulkan_shaderc.c index 56a2c0eef5..7144f04f21 100644 --- a/libavfilter/vulkan_shaderc.c +++ b/libavfilter/vulkan_shaderc.c @@ -41,6 +41,14 @@ static int shdc_shader_compile(FFVulkanContext *s, FFVkSPIRVCompiler *ctx, [VK_SHADER_STAGE_VERTEX_BIT] = shaderc_glsl_vertex_shader, [VK_SHADER_STAGE_FRAGMENT_BIT] = shaderc_glsl_fragment_shader, [VK_SHADER_STAGE_COMPUTE_BIT] = shaderc_glsl_compute_shader, + [VK_SHADER_STAGE_MESH_BIT_EXT] = shaderc_mesh_shader, + [VK_SHADER_STAGE_TASK_BIT_EXT] = shaderc_task_shader, + [VK_SHADER_STAGE_RAYGEN_BIT_KHR] = shaderc_raygen_shader, + [VK_SHADER_STAGE_ANY_HIT_BIT_KHR] = shaderc_anyhit_shader, + [VK_SHADER_STAGE_CLOSEST_HIT_BIT_KHR] = shaderc_closesthit_shader, + [VK_SHADER_STAGE_MISS_BIT_KHR] = shaderc_miss_shader, + [VK_SHADER_STAGE_INTERSECTION_BIT_KHR] = shaderc_intersection_shader, + [VK_SHADER_STAGE_CALLABLE_BIT_KHR] = shaderc_callable_shader, }; shaderc_compile_options_t opts = shaderc_compile_options_initialize(); @@ -49,11 +57,17 @@ static int shdc_shader_compile(FFVulkanContext *s, FFVkSPIRVCompiler *ctx, return AVERROR(ENOMEM); shaderc_compile_options_set_target_env(opts, shaderc_target_env_vulkan, - shaderc_env_version_vulkan_1_2); - shaderc_compile_options_set_target_spirv(opts, shaderc_spirv_version_1_5); - shaderc_compile_options_set_generate_debug_info(opts); - shaderc_compile_options_set_optimization_level(opts, - shaderc_optimization_level_performance); + shaderc_env_version_vulkan_1_3); + shaderc_compile_options_set_target_spirv(opts, shaderc_spirv_version_1_6); + + if (s->extensions & FF_VK_EXT_DEBUG_UTILS) { + shaderc_compile_options_set_generate_debug_info(opts); + shaderc_compile_options_set_optimization_level(opts, + shaderc_optimization_level_zero); + } else { + shaderc_compile_options_set_optimization_level(opts, + shaderc_optimization_level_performance); + } res = shaderc_compile_into_spv((shaderc_compiler_t)ctx->priv, shd->src.str, strlen(shd->src.str),