---
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-requ...@ffmpeg.org with subject "unsubscribe".
