From patchwork Thu Oct 3 05:51:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 51991 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b18c:0:b0:48e:c0f8:d0de with SMTP id q12csp145775vqn; Wed, 2 Oct 2024 22:52:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUw5dcu6TGqE2Wptjg40taYL3Bhcj/qxTy/X2KSo3y92/RTfMgRnSY1VEJMbIemX6Ix9V1CQlkT47v2yH0HP+UM@gmail.com X-Google-Smtp-Source: AGHT+IGcn0VvuKHzwDL4CBU1vV4+KQG0bG72CiMB2AzKLWfFyfWOTSC+/vgxLO1O43+o43tzO+82 X-Received: by 2002:a05:6402:27cc:b0:5c3:eb29:50c5 with SMTP id 4fb4d7f45d1cf-5c8b1b9188cmr1620006a12.9.1727934734875; Wed, 02 Oct 2024 22:52:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727934734; cv=none; d=google.com; s=arc-20240605; b=EbgN828jhiLuu5/JIvMBoaXDRgH64iHzICGPHu4KXUfyvtLjPK6ttZBNyOSNGMGs0w 1Mhyk/UJKFikUv7HBaoxqFT5kGuLNu2vmehOcHMIWnGCg9D8ArymysvkxAfWrR1YWM1g JNzkYTvBr5BZ8oZaqQxIvMc9j0ebJp7bjcuH9G1Lm9aTvAjqwWx6L8UzAGDvASnTEnSS dRTxr2bcaRxe3otHCA5PgxpHo2TKxguV3FH8Hd3gl52BNY19wPxYlKRy7UeXVFCoHks9 P12EJ0xzhzKXKoQ+S8XMZj0ssMyjFAhYfOu3QL1Nqn7Cia9jAAcu0EeAS3QBGcydphyo xKfg== 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=kwOxVv2oqdUJUAIEQ5DtSOaVpvw1BZJyIlOzeYbilmU=; fh=nenT92/WZoU6unXd3J6UhGUdod4piddKfVtctNBOh6k=; b=iWkAtcm6E4DY74j4AqRg+0g8728/qxRFTSA7HMTI7meDh3nobg4vbzYcwk44fx/RfE PxTfjhd5HxQsBmN8xWCUd9BvKndT/zvdwcp4nsygf0pj7EvKseYAR8dQHeiobwAdP3V8 GMMP1SUQaWvs9rDRLU9WirF8Qt5dldKZXQNpFyinirnm7YPRqi3DWvlcf6TtcROI5sdM T5lrpdhZEM5vXBJ+ZZIIcOU6In5IzfQo6m8+DDSrZpBb8ChkksapH25qZtVTkHnyuS5v UdlYhEwFcrrCpsvZTvIqjf8Z0CrJI91Rj4T6NvO514V3iqSrendhhQW2FHPCnFlYY2xT bSjA==; 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-5c8ca47cc8csi362242a12.223.2024.10.02.22.52.14; Wed, 02 Oct 2024 22:52:14 -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 BA7F468DA6B; Thu, 3 Oct 2024 08:51:52 +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 7391B68D75F for ; Thu, 3 Oct 2024 08:51:44 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Oct 2024 07:51:30 +0200 Message-ID: <20241003055141.415483-3-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 3/8] hwcontext_vulkan: enable VK_KHR_shader_relaxed_extended_instruction 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: ATvsJX/9t+1B --- libavutil/hwcontext_vulkan.c | 39 ++++++++++++++++++++++++++++++++++++ libavutil/vulkan_functions.h | 1 + libavutil/vulkan_loader.h | 1 + 3 files changed, 41 insertions(+) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index d6500de677..518c3d642b 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -100,6 +100,9 @@ typedef struct VulkanDevicePriv { VkPhysicalDeviceOpticalFlowFeaturesNV optical_flow_features; VkPhysicalDeviceShaderObjectFeaturesEXT shader_object_features; VkPhysicalDeviceVideoMaintenance1FeaturesKHR video_maint_1_features; +#ifdef VK_KHR_shader_relaxed_extended_instruction + VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR relaxed_extended_instr_features; +#endif /* Queues */ pthread_mutex_t **qf_mutex; @@ -622,6 +625,28 @@ static int check_extensions(AVHWDeviceContext *ctx, int dev, AVDictionary *opts, } } +#ifdef VK_KHR_shader_relaxed_extended_instruction + if (debug_mode == FF_VULKAN_DEBUG_PRINTF) { + tstr = VK_KHR_SHADER_RELAXED_EXTENDED_INSTRUCTION_EXTENSION_NAME; + found = 0; + for (int j = 0; j < sup_ext_count; j++) { + if (!strcmp(tstr, sup_ext[j].extensionName)) { + found = 1; + break; + } + } + if (found) { + av_log(ctx, AV_LOG_VERBOSE, "Using %s extension %s\n", mod, tstr); + ADD_VAL_TO_LIST(extension_names, extensions_found, tstr); + } else { + av_log(ctx, AV_LOG_ERROR, "Debug printf enabled, but extension \"%s\" not found!\n", + tstr); + err = AVERROR(EINVAL); + goto fail; + } +#endif + } + if (user_exts_str) { char *save, *token = av_strtok(user_exts_str, "+", &save); while (token) { @@ -1419,9 +1444,19 @@ static int vulkan_device_create_internal(AVHWDeviceContext *ctx, VkPhysicalDeviceTimelineSemaphoreFeatures timeline_features = { .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES, }; +#ifdef VK_KHR_shader_relaxed_extended_instruction + VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR relaxed_extended_instr_features = { + .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_RELAXED_EXTENDED_INSTRUCTION_FEATURES_KHR, + .pNext = &timeline_features, + }; +#endif VkPhysicalDeviceVideoMaintenance1FeaturesKHR video_maint_1_features = { .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_MAINTENANCE_1_FEATURES_KHR, +#ifdef VK_KHR_shader_relaxed_extended_instruction + .pNext = &relaxed_extended_instr_features, +#else .pNext = &timeline_features, +#endif }; VkPhysicalDeviceShaderObjectFeaturesEXT shader_object_features = { .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_FEATURES_EXT, @@ -1535,6 +1570,10 @@ static int vulkan_device_create_internal(AVHWDeviceContext *ctx, p->shader_object_features.shaderObject = shader_object_features.shaderObject; +#ifdef VK_KHR_shader_relaxed_extended_instruction + p->relaxed_extended_instr_features.shaderRelaxedExtendedInstruction = relaxed_extended_instr_features.shaderRelaxedExtendedInstruction; +#endif + /* Find and enable extensions */ if ((err = check_extensions(ctx, 1, opts, &dev_info.ppEnabledExtensionNames, &dev_info.enabledExtensionCount, debug_mode))) { diff --git a/libavutil/vulkan_functions.h b/libavutil/vulkan_functions.h index c565d62335..7a5385381b 100644 --- a/libavutil/vulkan_functions.h +++ b/libavutil/vulkan_functions.h @@ -47,6 +47,7 @@ typedef uint64_t FFVulkanExtensions; #define FF_VK_EXT_OPTICAL_FLOW (1ULL << 12) /* VK_NV_optical_flow */ #define FF_VK_EXT_SHADER_OBJECT (1ULL << 13) /* VK_EXT_shader_object */ #define FF_VK_EXT_PUSH_DESCRIPTOR (1ULL << 14) /* VK_KHR_push_descriptor */ +#define FF_VK_EXT_RELAXED_EXTENDED_INSTR (1ULL << 15) /* VK_KHR_shader_relaxed_extended_instruction */ /* Video extensions */ #define FF_VK_EXT_VIDEO_QUEUE (1ULL << 36) /* VK_KHR_video_queue */ diff --git a/libavutil/vulkan_loader.h b/libavutil/vulkan_loader.h index 2022eb320b..3dc27c159e 100644 --- a/libavutil/vulkan_loader.h +++ b/libavutil/vulkan_loader.h @@ -40,6 +40,7 @@ static inline uint64_t ff_vk_extensions_to_mask(const char * const *extensions, const char *name; FFVulkanExtensions flag; } extension_map[] = { + { VK_KHR_SHADER_RELAXED_EXTENDED_INSTRUCTION_EXTENSION_NAME, FF_VK_EXT_RELAXED_EXTENDED_INSTR }, { VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_DMABUF_MEMORY }, { VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME, FF_VK_EXT_DRM_MODIFIER_FLAGS }, { VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_FD_MEMORY },