vulkan: parse instance list and add the DEBUG_UTILS extension

Required to let users know whether debugging is active.

Lynne committed 2 years ago

Commit 356d1cc1 parent e3676d94 files · +8 −1Browse files

Unified · Split

4 files

libavfilter/vulkan_filter.c +2 −0
libavutil/hwcontext_vulkan.c +0 −1
libavutil/vulkan.c +2 −0
libavutil/vulkan_loader.h +4 −0

libavfilter/vulkan_filter.c+2−0

@@ -151,6 +151,8 @@ skip: · 150 unmodified lines
151	151
152	152	s->extensions = ff_vk_extensions_to_mask(vk_dev->enabled_dev_extensions,
153	153	vk_dev->nb_enabled_dev_extensions);
	154	+ s->extensions \|= ff_vk_extensions_to_mask(vk_dev->enabled_inst_extensions,
	155	+ vk_dev->nb_enabled_inst_extensions);
154	156
155	157	err = ff_vk_load_functions(device_ctx, &s->vkfn, s->extensions, 1, 1);
156	158	if (err < 0) {

libavutil/hwcontext_vulkan.c+0−1

@@ -739,7 +739,6 @@ static int check_extensions(AVHWDeviceContext ctx, int dev, AVDictionary opts, · 738 unmodified lines
739	739	if (found) {
740	740	av_log(ctx, AV_LOG_VERBOSE, "Using %s extension %s\n", mod, tstr);
741	741	ADD_VAL_TO_LIST(extension_names, extensions_found, tstr);
742		− p->vkctx.extensions \|= FF_VK_EXT_DEBUG_UTILS;
743	742	} else {
744	743	av_log(ctx, AV_LOG_ERROR, "Debug extension \"%s\" not found!\n",
745	744	tstr);

libavutil/vulkan.c+2−0

@@ -2347,6 +2347,8 @@ int ff_vk_init(FFVulkanContext s, void log_parent, · 2346 unmodified lines
2347	2347
2348	2348	s->extensions = ff_vk_extensions_to_mask(s->hwctx->enabled_dev_extensions,
2349	2349	s->hwctx->nb_enabled_dev_extensions);
	2350	+ s->extensions \|= ff_vk_extensions_to_mask(s->hwctx->enabled_inst_extensions,
	2351	+ s->hwctx->nb_enabled_inst_extensions);
2350	2352
2351	2353	err = ff_vk_load_functions(s->device, &s->vkfn, s->extensions, 1, 1);
2352	2354	if (err < 0) {

libavutil/vulkan_loader.h+4−0

@@ -40,6 +40,10 @@ static inline uint64_t ff_vk_extensions_to_mask(const char * const *extensions, · 39 unmodified lines
40	40	const char *name;
41	41	FFVulkanExtensions flag;
42	42	} extension_map[] = {
	43	+ /* Instance extensions */
	44	+ { VK_EXT_DEBUG_UTILS_EXTENSION_NAME, FF_VK_EXT_DEBUG_UTILS },
	45	+
	46	+ /* Device extensions */
43	47	{ VK_KHR_SHADER_RELAXED_EXTENDED_INSTRUCTION_EXTENSION_NAME, FF_VK_EXT_RELAXED_EXTENDED_INSTR },
44	48	{ VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_DMABUF_MEMORY },
45	49	{ VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME, FF_VK_EXT_DRM_MODIFIER_FLAGS },