hwcontext_vulkan: expose enabled device and instance extensions

This solves a huge oversight - it lets users reliably use their own AVVulkanDeviceContext. Otherwise, the extensions supplied and enabled are not discoverable by anything outside of hwcontext_vulkan. Also clarifies that any user-supplied VkInstance must be at least 1.1.

Lynne committed 6 years ago

Commit dccd07f1 parent 3c5e5a54 files · +56 −11Browse files

Unified · Split

4 files

doc/APIchanges +4 −0
libavutil/hwcontext_vulkan.c +31 −9
libavutil/hwcontext_vulkan.h +20 −1
libavutil/version.h +1 −1

doc/APIchanges+4−0

@@ -15,6 +15,10 @@ libavutil: 2017-10-21 · 14 unmodified lines
15		15
16	API changes, most recent first:	16	API changes, most recent first:
17		17
		18	2020-05-10 - xxxxxxxxxx - lavu 56.44.100 - hwcontext_vulkan.h
		19	Add enabled_inst_extensions, num_enabled_inst_extensions, enabled_dev_extensions
		20	and num_enabled_dev_extensions fields to AVVulkanDeviceContext
		21
18	2020-04-22 - 0e1db79e37 - lavc 58.81.100 - packet.h	22	2020-04-22 - 0e1db79e37 - lavc 58.81.100 - packet.h
19	- lavu 56.43.100 - dovi_meta.h	23	- lavu 56.43.100 - dovi_meta.h
20	Add AV_PKT_DATA_DOVI_CONF and AVDOVIDecoderConfigurationRecord.	24	Add AV_PKT_DATA_DOVI_CONF and AVDOVIDecoderConfigurationRecord.

libavutil/hwcontext_vulkan.c+31−9

     /* Try to create the instance */
     ret = vkCreateInstance(&inst_props, hwctx->alloc, &hwctx->inst);
-    /* Free used memory */
-    for (int i = 0; i < inst_props.enabledExtensionCount; i++)
-        av_free((void *)inst_props.ppEnabledExtensionNames[i]);
-    av_free((void *)inst_props.ppEnabledExtensionNames);
     /* Check for errors */
     if (ret != VK_SUCCESS) {
         av_log(ctx, AV_LOG_ERROR, "Instance creation failure: %s\n",
                vk_ret2str(ret));
+        for (int i = 0; i < inst_props.enabledExtensionCount; i++)
+            av_free((void *)inst_props.ppEnabledExtensionNames[i]);
+        av_free((void *)inst_props.ppEnabledExtensionNames);
         return AVERROR_EXTERNAL;
     }
                                            hwctx->alloc, &p->debug_ctx);
     }
+    hwctx->enabled_inst_extensions = inst_props.ppEnabledExtensionNames;
+    hwctx->nb_enabled_inst_extensions = inst_props.enabledExtensionCount;
     return 0;
 }
     }
     vkDestroyInstance(hwctx->inst, hwctx->alloc);
+    for (int i = 0; i < hwctx->nb_enabled_inst_extensions; i++)
+        av_free((void *)hwctx->enabled_inst_extensions[i]);
+    av_free((void *)hwctx->enabled_inst_extensions);
+    for (int i = 0; i < hwctx->nb_enabled_dev_extensions; i++)
+        av_free((void *)hwctx->enabled_dev_extensions[i]);
+    av_free((void *)hwctx->enabled_dev_extensions);
 }
 static int vulkan_device_create_internal(AVHWDeviceContext *ctx,
     ret = vkCreateDevice(hwctx->phys_dev, &dev_info, hwctx->alloc,
                          &hwctx->act_dev);
-    for (int i = 0; i < dev_info.enabledExtensionCount; i++)
-        av_free((void *)dev_info.ppEnabledExtensionNames[i]);
-    av_free((void *)dev_info.ppEnabledExtensionNames);
     if (ret != VK_SUCCESS) {
         av_log(ctx, AV_LOG_ERROR, "Device creation failure: %s\n",
                vk_ret2str(ret));
+        for (int i = 0; i < dev_info.enabledExtensionCount; i++)
+            av_free((void *)dev_info.ppEnabledExtensionNames[i]);
+        av_free((void *)dev_info.ppEnabledExtensionNames);
         err = AVERROR_EXTERNAL;
         goto end;
     }
     if (opt_d)
         p->use_linear_images = strtol(opt_d->value, NULL, 10);
+    hwctx->enabled_dev_extensions = dev_info.ppEnabledExtensionNames;
+    hwctx->nb_enabled_dev_extensions = dev_info.enabledExtensionCount;
 end:
     return err;
 }
     AVVulkanDeviceContext *hwctx = ctx->hwctx;
     VulkanDevicePriv *p = ctx->internal->priv;
+    /* Set device extension flags */
+    for (int i = 0; i < hwctx->nb_enabled_dev_extensions; i++) {
+        for (int j = 0; j < FF_ARRAY_ELEMS(optional_device_exts); j++) {
+            if (!strcmp(hwctx->enabled_dev_extensions[i],
+                        optional_device_exts[j].name)) {
+                p->extensions |= optional_device_exts[j].flag;
+                break;
+            }
+        }
+    }
     vkGetPhysicalDeviceQueueFamilyProperties(hwctx->phys_dev, &queue_num, NULL);
     if (!queue_num) {
         av_log(ctx, AV_LOG_ERROR, "Failed to get queues!\n");

libavutil/hwcontext_vulkan.h+20−1

@@ -39,7 +39,7 @@ typedef struct AVVulkanDeviceContext { · 38 unmodified lines
39	*/	39	*/
40	const VkAllocationCallbacks *alloc;	40	const VkAllocationCallbacks *alloc;
41	/**	41	/**
42	* Instance	42	* Vulkan instance. Must be at least version 1.1.
43	*/	43	*/
44	VkInstance inst;	44	VkInstance inst;
45	/**	45	/**
@@ -65,6 +65,25 @@ typedef struct AVVulkanDeviceContext { · 19 unmodified lines
65	* Queue family index for compute ops	65	* Queue family index for compute ops
66	*/	66	*/
67	int queue_family_comp_index;	67	int queue_family_comp_index;
		68	/**
		69	* Enabled instance extensions. By default, VK_KHR_surface is enabled if found.
		70	* If supplying your own device context, set this to an array of strings, with
		71	* each entry containing the specified Vulkan extension string to enable.
		72	* Duplicates are possible and accepted.
		73	* If no extensions are enabled, set these fields to NULL, and 0 respectively.
		74	*/
		75	const char * const *enabled_inst_extensions;
		76	int nb_enabled_inst_extensions;
		77	/**
		78	* Enabled device extensions. By default, VK_KHR_external_memory_fd,
		79	* VK_EXT_external_memory_dma_buf, VK_EXT_image_drm_format_modifier and
		80	* VK_KHR_external_semaphore_fd are enabled if found.
		81	* If supplying your own device context, these fields takes the same format as
		82	* the above fields, with the same conditions that duplicates are possible
		83	* and accepted, and that NULL and 0 respectively means no extensions are enabled.
		84	*/
		85	const char * const *enabled_dev_extensions;
		86	int nb_enabled_dev_extensions;
68	} AVVulkanDeviceContext;	87	} AVVulkanDeviceContext;
69		88
70	/**	89	/**

libavutil/version.h+1−1

@@ -79,7 +79,7 @@ · 78 unmodified lines
79	*/	79	*/
80		80
81	#define LIBAVUTIL_VERSION_MAJOR 56	81	#define LIBAVUTIL_VERSION_MAJOR 56
82	#define LIBAVUTIL_VERSION_MINOR 43	82	#define LIBAVUTIL_VERSION_MINOR 44
83	#define LIBAVUTIL_VERSION_MICRO 100	83	#define LIBAVUTIL_VERSION_MICRO 100
84		84
85	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \	85	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

hwcontext_vulkan: expose enabled device and instance extensions

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code