From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 97BA94F400 for ; Mon, 16 Jun 2025 19:31:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 4FBE968DE3E; Mon, 16 Jun 2025 22:31:04 +0300 (EEST) Received: from vidala.pars.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 02A4D68DE33 for ; Mon, 16 Jun 2025 22:30:57 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; s=202405r; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1750102257; bh=ec8vp0Zcdwsgs74vmouZyJ3 +j43xxdsVVnnkAG64Be8=; b=cWr8psyfs9TzR84IM2SM51Jdd0L2oGLh1+LXlxPUsPV8pPwWyY zn7lP7aGqrrjXBbHUTGmysAFGciAjAKbnFCtxc524SQ0MrBFrvRI48imirpcz6AGYcaPTygbLlB yP4WyU4r4JQzoBildMD6E6Zi019OY5yGkiRDCR+zKBaSPVw3cCJJ7bjQQJ0Rg9HL0OK9LlB6Jqd NGy+BDxHJfd/a0tVrloIgtVNNJntJL9aUe3pTka0Y2mAv1ddHhZGTc6XbnkuPXyh1m9JrQYAdfd KZ95kbezegh8emdqDv1aCzdr2Ma0WeknU0wybPNzaRnJVv56OTA8d6u/pKALD6/8HZQ==; DKIM-Signature: v=1; a=ed25519-sha256; s=202405e; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1750102257; bh=ec8vp0Zcdwsgs74vmouZyJ3 +j43xxdsVVnnkAG64Be8=; b=OQeAI55yktE1T5gktcrCCZgwxS7oScC2sT3YgP8SfsMD6ns0lK Y3SsicM6MjQyOIKerJ3lu3pcNw2gvs+vzJDw==; From: Lynne To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Jun 2025 04:30:23 +0900 Message-ID: <20250616193040.2517489-2-dev@lynne.ee> X-Mailer: git-send-email 2.49.0.395.g12beb8f557c In-Reply-To: <20250616193040.2517489-1-dev@lynne.ee> References: <20250616193040.2517489-1-dev@lynne.ee> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] hwcontext_vulkan: enable unified image layouts 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: --- libavutil/hwcontext_vulkan.c | 11 +++++++++++ libavutil/vulkan_functions.h | 1 + libavutil/vulkan_loader.h | 3 +++ 3 files changed, 15 insertions(+) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index f05b75110d..dcca217af3 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -81,6 +81,9 @@ typedef struct VulkanDeviceFeatures { VkPhysicalDeviceTimelineSemaphoreFeatures timeline_semaphore; VkPhysicalDeviceShaderSubgroupRotateFeaturesKHR subgroup_rotate; VkPhysicalDeviceHostImageCopyFeaturesEXT host_image_copy; +#ifdef VK_KHR_unified_image_layouts + VkPhysicalDeviceUnifiedImageLayoutsFeaturesKHR unified_image_layouts; +#endif #ifdef VK_KHR_shader_expect_assume VkPhysicalDeviceShaderExpectAssumeFeaturesKHR expect_assume; @@ -212,6 +215,10 @@ static void device_features_init(AVHWDeviceContext *ctx, VulkanDeviceFeatures *f VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_ROTATE_FEATURES_KHR); FF_VK_STRUCT_EXT(s, &feats->device, &feats->host_image_copy, FF_VK_EXT_HOST_IMAGE_COPY, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_FEATURES_EXT); +#ifdef VK_KHR_unified_image_layouts + FF_VK_STRUCT_EXT(s, &feats->device, &feats->unified_image_layouts, FF_VK_EXT_UNIFIED_IMG_LAYOUTS, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFIED_IMAGE_LAYOUTS_FEATURES_KHR); +#endif #ifdef VK_KHR_shader_expect_assume FF_VK_STRUCT_EXT(s, &feats->device, &feats->expect_assume, FF_VK_EXT_EXPECT_ASSUME, @@ -289,6 +296,10 @@ static void device_features_copy_needed(VulkanDeviceFeatures *dst, VulkanDeviceF COPY_VAL(timeline_semaphore.timelineSemaphore); COPY_VAL(subgroup_rotate.shaderSubgroupRotate); COPY_VAL(host_image_copy.hostImageCopy); +#ifdef VK_KHR_unified_image_layouts + COPY_VAL(unified_image_layouts.unifiedImageLayouts); + COPY_VAL(unified_image_layouts.unifiedImageLayoutsVideo); +#endif COPY_VAL(video_maintenance_1.videoMaintenance1); #ifdef VK_KHR_video_maintenance2 diff --git a/libavutil/vulkan_functions.h b/libavutil/vulkan_functions.h index 68fa7b802d..5094fe3a80 100644 --- a/libavutil/vulkan_functions.h +++ b/libavutil/vulkan_functions.h @@ -50,6 +50,7 @@ typedef uint64_t FFVulkanExtensions; #define FF_VK_EXT_EXPECT_ASSUME (1ULL << 16) /* VK_KHR_shader_expect_assume */ #define FF_VK_EXT_SUBGROUP_ROTATE (1ULL << 17) /* VK_KHR_shader_subgroup_rotate */ #define FF_VK_EXT_HOST_IMAGE_COPY (1ULL << 18) /* VK_EXT_host_image_copy */ +#define FF_VK_EXT_UNIFIED_IMG_LAYOUTS (1ULL << 19) /* VK_KHR_unified_image_laouys */ /* 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 7e805fdd4c..3f8edff8a9 100644 --- a/libavutil/vulkan_loader.h +++ b/libavutil/vulkan_loader.h @@ -60,6 +60,9 @@ static inline uint64_t ff_vk_extensions_to_mask(const char * const *extensions, { VK_EXT_SHADER_OBJECT_EXTENSION_NAME, FF_VK_EXT_SHADER_OBJECT }, { VK_KHR_SHADER_SUBGROUP_ROTATE_EXTENSION_NAME, FF_VK_EXT_SUBGROUP_ROTATE }, { VK_EXT_HOST_IMAGE_COPY_EXTENSION_NAME, FF_VK_EXT_HOST_IMAGE_COPY }, +#ifdef VK_KHR_unified_image_layouts + { VK_KHR_UNIFIED_IMAGE_LAYOUTS_EXTENSION_NAME, FF_VK_EXT_UNIFIED_IMG_LAYOUTS }, +#endif { VK_KHR_VIDEO_MAINTENANCE_1_EXTENSION_NAME, FF_VK_EXT_VIDEO_MAINTENANCE_1 }, #ifdef VK_KHR_video_maintenance2 { VK_KHR_VIDEO_MAINTENANCE_2_EXTENSION_NAME, FF_VK_EXT_VIDEO_MAINTENANCE_2 }, -- 2.49.0 _______________________________________________ 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".