vulkan: add support for the atomic float ops extension

Lynne committed 3 years ago

Commit dfff3871 parent 88e2cca5 files · +33 −1Browse files

Unified · Split

5 files

libavutil/hwcontext_vulkan.c +14 −1
libavutil/vulkan.c +13 −0
libavutil/vulkan.h +4 −0
libavutil/vulkan_functions.h +1 −0
libavutil/vulkan_loader.h +1 −0

     VkPhysicalDeviceVulkan12Features device_features_1_2;
     VkPhysicalDeviceVulkan13Features device_features_1_3;
     VkPhysicalDeviceDescriptorBufferFeaturesEXT desc_buf_features;
+    VkPhysicalDeviceShaderAtomicFloatFeaturesEXT atomic_float_features;
     /* Queues */
     pthread_mutex_t **qf_mutex;
     { VK_KHR_SAMPLER_YCBCR_CONVERSION_EXTENSION_NAME,         FF_VK_EXT_NO_FLAG                },
     { VK_EXT_DESCRIPTOR_BUFFER_EXTENSION_NAME,                FF_VK_EXT_DESCRIPTOR_BUFFER,     },
     { VK_EXT_PHYSICAL_DEVICE_DRM_EXTENSION_NAME,              FF_VK_EXT_DEVICE_DRM             },
+    { VK_EXT_SHADER_ATOMIC_FLOAT_EXTENSION_NAME,              FF_VK_EXT_ATOMIC_FLOAT           },
     /* Imports/exports */
     { VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME,               FF_VK_EXT_EXTERNAL_FD_MEMORY     },
     VkPhysicalDeviceTimelineSemaphoreFeatures timeline_features = {
         .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES,
     };
+    VkPhysicalDeviceShaderAtomicFloatFeaturesEXT atomic_float_features = {
+        .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_FEATURES_EXT,
+        .pNext = &timeline_features,
+    };
     VkPhysicalDeviceDescriptorBufferFeaturesEXT desc_buf_features = {
         .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_FEATURES_EXT,
-        .pNext = &timeline_features,
+        .pNext = &atomic_float_features,
     };
     VkPhysicalDeviceVulkan13Features dev_features_1_3 = {
         .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES,
     p->device_features_1_3.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES;
     p->device_features_1_3.pNext = &p->desc_buf_features;
     p->desc_buf_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_FEATURES_EXT;
+    p->desc_buf_features.pNext = &p->atomic_float_features;
+    p->atomic_float_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_FEATURES_EXT;
+    p->atomic_float_features.pNext = NULL;
     ctx->free = vulkan_device_free;
     /* Create an instance if not given one */
     p->desc_buf_features.descriptorBuffer = desc_buf_features.descriptorBuffer;
     p->desc_buf_features.descriptorBufferPushDescriptors = desc_buf_features.descriptorBufferPushDescriptors;
+    p->atomic_float_features.shaderBufferFloat32Atomics = atomic_float_features.shaderBufferFloat32Atomics;
+    p->atomic_float_features.shaderBufferFloat32AtomicAdd = atomic_float_features.shaderBufferFloat32AtomicAdd;
     dev_info.pNext = &hwctx->device_features;
     /* Setup queue family */

libavutil/vulkan.c+13−0

@@ -107,8 +107,21 @@ int ff_vk_load_props(FFVulkanContext *s) · 106 unmodified lines
107	.pNext = &s->driver_props,	107	.pNext = &s->driver_props,
108	};	108	};
109		109
		110	s->atomic_float_feats = (VkPhysicalDeviceShaderAtomicFloatFeaturesEXT) {
		111	.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_FEATURES_EXT,
		112	};
		113	s->feats_12 = (VkPhysicalDeviceVulkan12Features) {
		114	.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES,
		115	.pNext = &s->atomic_float_feats,
		116	};
		117	s->feats = (VkPhysicalDeviceFeatures2) {
		118	.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2,
		119	.pNext = &s->feats_12,
		120	};
		121
110	vk->GetPhysicalDeviceProperties2(s->hwctx->phys_dev, &s->props);	122	vk->GetPhysicalDeviceProperties2(s->hwctx->phys_dev, &s->props);
111	vk->GetPhysicalDeviceMemoryProperties(s->hwctx->phys_dev, &s->mprops);	123	vk->GetPhysicalDeviceMemoryProperties(s->hwctx->phys_dev, &s->mprops);
		124	vk->GetPhysicalDeviceFeatures2(s->hwctx->phys_dev, &s->feats);
112		125
113	if (s->qf_props)	126	if (s->qf_props)
114	return 0;	127	return 0;

libavutil/vulkan.h+4−0

@@ -240,6 +240,10 @@ typedef struct FFVulkanContext { · 239 unmodified lines
240	VkQueueFamilyProperties2 *qf_props;	240	VkQueueFamilyProperties2 *qf_props;
241	int tot_nb_qfs;	241	int tot_nb_qfs;
242		242
		243	VkPhysicalDeviceShaderAtomicFloatFeaturesEXT atomic_float_feats;
		244	VkPhysicalDeviceVulkan12Features feats_12;
		245	VkPhysicalDeviceFeatures2 feats;
		246
243	AVHWDeviceContext *device;	247	AVHWDeviceContext *device;
244	AVVulkanDeviceContext *hwctx;	248	AVVulkanDeviceContext *hwctx;
245		249

libavutil/vulkan_functions.h+1−0

@@ -44,6 +44,7 @@ typedef enum FFVulkanExtensions { · 43 unmodified lines
44	FF_VK_EXT_VIDEO_DECODE_H264 = 1ULL << 12, /* VK_EXT_video_decode_h264 */	44	FF_VK_EXT_VIDEO_DECODE_H264 = 1ULL << 12, /* VK_EXT_video_decode_h264 */
45	FF_VK_EXT_VIDEO_DECODE_H265 = 1ULL << 13, /* VK_EXT_video_decode_h265 */	45	FF_VK_EXT_VIDEO_DECODE_H265 = 1ULL << 13, /* VK_EXT_video_decode_h265 */
46	FF_VK_EXT_VIDEO_DECODE_AV1 = 1ULL << 14, /* VK_MESA_video_decode_av1 */	46	FF_VK_EXT_VIDEO_DECODE_AV1 = 1ULL << 14, /* VK_MESA_video_decode_av1 */
		47	FF_VK_EXT_ATOMIC_FLOAT = 1ULL << 15, /* VK_EXT_shader_atomic_float */
47		48
48	FF_VK_EXT_NO_FLAG = 1ULL << 31,	49	FF_VK_EXT_NO_FLAG = 1ULL << 31,
49	} FFVulkanExtensions;	50	} FFVulkanExtensions;

libavutil/vulkan_loader.h+1−0

@@ -45,6 +45,7 @@ static inline uint64_t ff_vk_extensions_to_mask(const char * const *extensions, · 44 unmodified lines
45	{ VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_HOST_MEMORY },	45	{ VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_HOST_MEMORY },
46	{ VK_EXT_DEBUG_UTILS_EXTENSION_NAME, FF_VK_EXT_DEBUG_UTILS },	46	{ VK_EXT_DEBUG_UTILS_EXTENSION_NAME, FF_VK_EXT_DEBUG_UTILS },
47	{ VK_EXT_PHYSICAL_DEVICE_DRM_EXTENSION_NAME, FF_VK_EXT_DEVICE_DRM },	47	{ VK_EXT_PHYSICAL_DEVICE_DRM_EXTENSION_NAME, FF_VK_EXT_DEVICE_DRM },
		48	{ VK_EXT_SHADER_ATOMIC_FLOAT_EXTENSION_NAME, FF_VK_EXT_ATOMIC_FLOAT },
48	#ifdef _WIN32	49	#ifdef _WIN32
49	{ VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_WIN32_MEMORY },	50	{ VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_WIN32_MEMORY },
50	{ VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_WIN32_SEM },	51	{ VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_WIN32_SEM },

vulkan: add support for the atomic float ops extension

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code