From patchwork Thu Oct 3 05:51:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 51996 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b18c:0:b0:48e:c0f8:d0de with SMTP id q12csp151502vqn; Wed, 2 Oct 2024 23:09:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV6vdvlckTGt6L1Jg8cBVkjGRJemmtJcPSgZoz7TnfaBngw1PTIWbXi0c6tLfZGtyHD/Vbe7kKhpelXeerCLxf+@gmail.com X-Google-Smtp-Source: AGHT+IEd3Clqd8uzgCV6MzsFBMeXgAgBbmk9CzT2oFnAPDzFVJGJ/pQVETfW3acxghqR5iXgHMC8 X-Received: by 2002:a05:6402:2552:b0:5c8:ae42:88b with SMTP id 4fb4d7f45d1cf-5c8b1b72c85mr4778562a12.27.1727935744829; Wed, 02 Oct 2024 23:09:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727935744; cv=none; d=google.com; s=arc-20240605; b=YYMsW9yJmGBM6C8/tNKVoZmGAHWHUFXKIppKMOYm40yrGo89TjuW1LYiVAhWpYfpZ6 loQ/WgX0NBOZ+3UiNRoYL70xJeYkQtlONmq7EB6Zv5TB8Lt2PE+B52bitzKDT53uKVXh u+CyUWAtYxA2UYRPt42cUFWniLu4Z6eyz10LhUzO8hOZ9iT20OhYowLN877KzlTX+1v7 lfF9ZivFXFZetjdthvEfD5tGuPA8Xh/Ng5JaaFFrtDtQFSDbg0qUE9VAKClAmBqQjiXs ziOnDRns+hhFVncFHiM7JDBFu2USCSxrFSG+mk5Ux1l+YH6+fFQ/FRG5+DwNCVttlUWd +tDQ== 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=M4x14WGCNf1eg5jbDiel5PZSx6hyOL5CFc5/SOoXPrA=; fh=nenT92/WZoU6unXd3J6UhGUdod4piddKfVtctNBOh6k=; b=X2o+tVtlSfRNnkwUU4nTFKdPwrRFkCFpE0NS0WjL4yHjjC340wxJ1ydOb9A4z4JLfk FQPo6705be7DO0dyzwys7Qtsv4/cvkCtSOunQuDN/rrKbJGTx9oaXFeaU/kpIhXIw4n0 IAx0dnfFuEfPnQyiTigh0Qm6LX+ZIZyY/lNsue/MeFOVVW8kMiv6YcO6f8Dv4Vn8T556 pr9+Om6qMhMmvNnQRMqVE7OyJk1Syxb+nGUFAN5BVnGLct3/Woq+BULhnzNMiiSROC3j cmxKCQOoABv+m+eifXltt2H0aXpBDXyv4dIRrNP1oFLB4FCYKvjmiHPXsRVp8w9AcRBV KGgQ==; 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-5c8ca3c2681si418358a12.8.2024.10.02.23.09.04; Wed, 02 Oct 2024 23:09: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 850E368DAB1; Thu, 3 Oct 2024 08:51:56 +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 5DE3C68DA3C for ; Thu, 3 Oct 2024 08:51:51 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Oct 2024 07:51:33 +0200 Message-ID: <20241003055141.415483-6-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 6/8] vulkan_glslang: add more stages, target Vulkan 1.3 and output debug info 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: dTeAyioV3gAp --- libavfilter/vulkan_glslang.c | 39 +++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/libavfilter/vulkan_glslang.c b/libavfilter/vulkan_glslang.c index 7ac7d6b2c4..20a00354e0 100644 --- a/libavfilter/vulkan_glslang.c +++ b/libavfilter/vulkan_glslang.c @@ -149,21 +149,28 @@ static int glslc_shader_compile(FFVulkanContext *s, FFVkSPIRVCompiler *ctx, [VK_SHADER_STAGE_VERTEX_BIT] = GLSLANG_STAGE_VERTEX, [VK_SHADER_STAGE_FRAGMENT_BIT] = GLSLANG_STAGE_FRAGMENT, [VK_SHADER_STAGE_COMPUTE_BIT] = GLSLANG_STAGE_COMPUTE, +#if ((GLSLANG_VERSION_MAJOR) > 12) + [VK_SHADER_STAGE_TASK_BIT_EXT] = GLSLANG_STAGE_TASK, + [VK_SHADER_STAGE_MESH_BIT_EXT] = GLSLANG_STAGE_MESH, + [VK_SHADER_STAGE_RAYGEN_BIT_KHR] = GLSLANG_STAGE_RAYGEN, + [VK_SHADER_STAGE_INTERSECTION_BIT_KHR] = GLSLANG_STAGE_INTERSECT, + [VK_SHADER_STAGE_ANY_HIT_BIT_KHR] = GLSLANG_STAGE_ANYHIT, + [VK_SHADER_STAGE_CLOSEST_HIT_BIT_KHR] = GLSLANG_STAGE_CLOSESTHIT, + [VK_SHADER_STAGE_MISS_BIT_KHR] = GLSLANG_STAGE_MISS, + [VK_SHADER_STAGE_CALLABLE_BIT_KHR] = GLSLANG_STAGE_CALLABLE, +#endif }; const glslang_input_t glslc_input = { .language = GLSLANG_SOURCE_GLSL, .stage = glslc_stage[shd->stage], .client = GLSLANG_CLIENT_VULKAN, - /* GLSLANG_TARGET_VULKAN_1_2 before 11.6 resulted in targeting 1.0 */ -#if (((GLSLANG_VERSION_MAJOR) > 11) || ((GLSLANG_VERSION_MAJOR) == 11 && \ - (((GLSLANG_VERSION_MINOR) > 6) || ((GLSLANG_VERSION_MINOR) == 6 && \ - ((GLSLANG_VERSION_PATCH) > 0))))) +#if ((GLSLANG_VERSION_MAJOR) >= 12) + .client_version = GLSLANG_TARGET_VULKAN_1_3, + .target_language_version = GLSLANG_TARGET_SPV_1_6, +#else .client_version = GLSLANG_TARGET_VULKAN_1_2, .target_language_version = GLSLANG_TARGET_SPV_1_5, -#else - .client_version = GLSLANG_TARGET_VULKAN_1_1, - .target_language_version = GLSLANG_TARGET_SPV_1_3, #endif .target_language = GLSLANG_TARGET_SPV, .code = shd->src.str, @@ -175,6 +182,20 @@ static int glslc_shader_compile(FFVulkanContext *s, FFVkSPIRVCompiler *ctx, .resource = &glslc_resource_limits, }; +#if ((GLSLANG_VERSION_MAJOR) >= 12) + glslang_spv_options_t glslc_opts = { + .generate_debug_info = (s->extensions & FF_VK_EXT_DEBUG_UTILS), + .emit_nonsemantic_shader_debug_info = (s->extensions & FF_VK_EXT_RELAXED_EXTENDED_INSTR), + .emit_nonsemantic_shader_debug_source = (s->extensions & FF_VK_EXT_RELAXED_EXTENDED_INSTR), + .disable_optimizer = (s->extensions & FF_VK_EXT_DEBUG_UTILS), + .strip_debug_info = !(s->extensions & FF_VK_EXT_DEBUG_UTILS), + .optimize_size = 0, + .disassemble = 0, + .validate = 1, + .compile_only = 0, + }; +#endif + av_assert0(glslc_refcount); *opaque = NULL; @@ -218,7 +239,11 @@ static int glslc_shader_compile(FFVulkanContext *s, FFVkSPIRVCompiler *ctx, return AVERROR(EINVAL); } +#if ((GLSLANG_VERSION_MAJOR) >= 12) + glslang_program_SPIRV_generate_with_options(glslc_program, glslc_input.stage, &glslc_opts); +#else glslang_program_SPIRV_generate(glslc_program, glslc_input.stage); +#endif messages = glslang_program_SPIRV_get_messages(glslc_program); if (messages) {