/* 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");
*/
const VkAllocationCallbacks *alloc;
/**
- * Instance
+ * Vulkan instance. Must be at least version 1.1.
*/
VkInstance inst;
/**
* Queue family index for compute ops
*/
int queue_family_comp_index;
+ /**
+ * Enabled instance extensions. By default, VK_KHR_surface is enabled if found.
+ * If supplying your own device context, set this to an array of strings, with
+ * each entry containing the specified Vulkan extension string to enable.
+ * Duplicates are possible and accepted.
+ * If no extensions are enabled, set these fields to NULL, and 0 respectively.
+ */
+ const char * const *enabled_inst_extensions;
+ int nb_enabled_inst_extensions;
+ /**
+ * Enabled device extensions. By default, VK_KHR_external_memory_fd,
+ * VK_EXT_external_memory_dma_buf, VK_EXT_image_drm_format_modifier and
+ * VK_KHR_external_semaphore_fd are enabled if found.
+ * If supplying your own device context, these fields takes the same format as
+ * the above fields, with the same conditions that duplicates are possible
+ * and accepted, and that NULL and 0 respectively means no extensions are enabled.
+ */
+ const char * const *enabled_dev_extensions;
+ int nb_enabled_dev_extensions;
} AVVulkanDeviceContext;
/**