library: Split capabilities creation from init - #924
Conversation
|
Author GrinlexGH not on autobuild list. Waiting for curator authorization before starting CI build. |
1 similar comment
|
Author GrinlexGH not on autobuild list. Waiting for curator authorization before starting CI build. |
Apply custom functions first, and change the static import to only fill members that are still null, matching the pattern already used by the dynamic global and instance import functions. This makes custom function precedence a property of the code itself instead of a side effect of call order.
|
Author GrinlexGH not on autobuild list. Waiting for curator authorization before starting CI build. |
1 similar comment
|
Author GrinlexGH not on autobuild list. Waiting for curator authorization before starting CI build. |
|
I pull the branch to #926 to trigger Internal C.I. which fails on macOS run of TEST(no_prototypes, create_instance_with_dynamic_pointers). Considering that on macOS we typically expect the Vulkan Loader and the Vulkan driver (MoltenVK or KosmicKrips) to be packaged with the Vulkan application, I can imagine DispatchLoaderDynamic would work pretty differently. Maybe it's just fine to disable the test on macOS |
|
Author GrinlexGH not on autobuild list. Waiting for curator authorization before starting CI build. |
1 similar comment
|
Author GrinlexGH not on autobuild list. Waiting for curator authorization before starting CI build. |
|
As stated here: https://github.com/KhronosGroup/MoltenVK#using-the-vulkan-sdk, on macOS you have to create an instance with |
christophe-lunarg
left a comment
There was a problem hiding this comment.
Open to here what you think about these comments.
| Once a Vulkan instance has been created, the instance-level Vulkan functions the library needs for device-level queries and device creation (such as `vkCreateDevice` and `vkGetPhysicalDeviceFeatures2`) must be loaded by calling the following command: | ||
|
|
||
| ```C++ | ||
| VkResult vpLoadInstance( |
There was a problem hiding this comment.
Did you consider automatically calling this function in vpCreateInstance to load the Vulkan device functions?
There was a problem hiding this comment.
I copied the behavior of these functions from volk and thought about it. I initially did this because I thought it was always explicit > implicit, plus, architecturally, instance creation shouldn't be tied to initialization. In theory, if a library user decides to create multiple VpCapabilities, their initialization won't be tied to instance creation, but will the user actually do that? Also, in theory, the user could get an instance from something other than vpCreateInstance, which would also allow for proper initialization of the VpCapabilities object, but again, it's unlikely the user will do this, although they can. I don't know whether to allow this option, because the valid use of the library is a single VpCapabilities and sequential creation of instance and devices using vulkan profiles functions. In fact, this library is quite high-level and architecturally it does not harm in any way, so I can implicitly call vpLoadInstance inside vpCreateInstance, but let the user call vpLoadInstance before vpCreateInstance if he needs to
| VpCapabilitiesCreateInfo createInfo{}; | ||
| createInfo.flags = VP_CAPABILITIES_CREATE_STATIC_BIT; | ||
| vpInitialize(&createInfo); | ||
| vpLoadInstance(::scaffold->instance, {}); |
There was a problem hiding this comment.
This is a little confuzing to me as removing or not this code in this test has no impact on this test.
There was a problem hiding this comment.
I wrote this before the implementation of possible implicit static initialization of a singleton, so it can indeed be removed
| vpInitialize(capabilities, &createInfo); | ||
| ``` | ||
|
|
||
| `VP_CAPABILITIES_CREATE_STATIC_BIT` tells the library to resolve the Vulkan functions it needs from the statically linked Vulkan loader; this flag is only available when the application links against the Vulkan loader directly (i.e. `VK_NO_PROTOTYPES` and `VP_DISABLE_STATIC_LINKING` are not defined). Applications that load Vulkan dynamically should instead use `VP_CAPABILITIES_CREATE_DYNAMIC_BIT` and provide a `VpVulkanFunctions::GetInstanceProcAddr` pointer through `pVulkanFunctions`, from which the library will resolve the remaining global-level functions it needs. |
There was a problem hiding this comment.
It's not clear to me what's the purpose of VP_DISABLE_STATIC_LINKING. Maybe it's just a documentation request.
There was a problem hiding this comment.
I created this in case the user doesn't want to use function declarations even if VK_NO_PROTOTYPES isn't defined. Although it's unlikely to be useful anywhere, I think it's best to remove it
| @@ -66,11 +67,9 @@ struct Capabilities { | |||
| vulkanFunctions.CreateDevice = vkCreateDevice; | |||
|
|
|||
| VpCapabilitiesCreateInfo createInfo; | |||
There was a problem hiding this comment.
It would have be great to keep the API backward compatible.
I created VP_USE_OBJECT only for this purpose but it's something I'd like to remove and have the Vulkan developer responsible for the loading and the Vulkan API.
|
|
||
| #include "mock_vulkan_api.hpp" | ||
| #include "test_vulkan_profiles.hpp" | ||
| #include "mock_vulkan_api.hpp" |
There was a problem hiding this comment.
Any specific reason for this switch in the lines?
There was a problem hiding this comment.
The tests use different versions of the vulkan_profiles header, so mock_vulkan_api.hpp intentionally does not include them, although it is required for mocking functions
| - [API reference](#api-reference) | ||
| - [Preprocessor definitions](#preprocessor-definitions) | ||
| - [Profile support and usage](#profile-support-and-usage) | ||
| - [Initializing capabilities](#initializing-capabilities) |
There was a problem hiding this comment.
I think the vpLoadInstance and vpInitialize functions are a little be confusing to me. Probably just an naming issue.
Maybe the VpCapabilities_T should be completely redesigned and considering it's not enabled by default I think it would be ok. Probably VpCapabilities is not a great name either and in a first place. Maybe VpInstance?
For example, we could create a per VkInstance table to store the function loaded with ImportInstanceVulkanFunctions_Dynamic.
I could picture something like vpLoadGlobalFunc replacing vpInitialize:
VpVulkanFunctions vulkanFunctions;
vpLoadGlobalFunc(dl.vkGetInstanceProcAddr, vulkanFunctions);
Where vpLoadGlobalFunc is just a helper function to fill global functions using dl.vkGetInstanceProcAddr. This leave the posibility for Vulkan developer to fill either function manually.
vpCreateInstance would return VK_ERROR_INITIALIZATION_FAILED if pVulkanFunctions is not initialized/validated when VK_NO_PROTOTYPES and VP_DISABLE_STATIC_LINKING are not defined.
Otherwise, vpCreateInstance would use the static function automatically.
There was a problem hiding this comment.
I think a table for instance -> VpCapabilities object would be an unnecessarily complex functionality
It's a good idea to use the vpLoadGlobalFunc helper. This could eliminate the _STATIC/_DYNAMIC_BIT altogether.
I think it could look something like this:
// VK_NO_PROTOTYPES may be defined
VpVulkanFunctions vulkanFunctions;
// Loads only global dynamic functions
vpLoadGlobalFunc(dl.vkGetInstanceProcAddr, &vulkanFunctions);
VpCapabilities capabilities {};
VpCapabilitiesCreateInfo createInfo;
createInfo.pVulkanFunctions = vulkanFunctions;
// If global functions have not been loaded, it will try to load static versions, else will return an error
// If global functions have been loaded, it will load the remaining functions in vpCreateInstance via vkGetInstanceProcAddr, and will not try to load static functions
// by the way if you rename VpCapabilities to VpInstance, you will create a conflict in function names :(
vpCreateCapabilities(&createInfo, nullptr, &capabilities);By the way, this will also solve the problem of backward compatibility, so apiVersion and flags can be deprecated
but how to dynamically initialize a singleton in this case?
Ah yes very good point. I ran again the internal C.I. tests. |
Fixes: #734
Previously
vpCreateCapabilities()both allocated theVpCapabilitiesobject and resolved all Vulkan function pointers via aVpCapabilitiesCreateInfoargument, includingapiVersion, which does not make sense outside of an instance/device context.Split this into three explicit steps:
vpCreateCapabilities()now only allocates the object.vpInitialize()resolves the global-level Vulkan functions (vkCreateInstance,vkEnumerateInstanceExtensionProperties, etc.), either statically or via an application-suppliedGetInstanceProcAddr.vpLoadInstance()resolves the instance-level functions (vkCreateDevice,vkGetPhysicalDevice*2, etc.) once aVkInstanceexists, with an optional flag to fall back to theVK_KHR_get_physical_device_properties2entry points on Vulkan 1.0 implementations.This removes the
apiVersionfield, which is no longer needed for validation, and dropsGetDeviceProcAddrfromVpVulkanFunctionssince device functions are now loaded through the instance.VP_PROFILE_CREATE_STATIC_BITis renamed toVP_CAPABILITIES_CREATE_STATIC_BITand is only availablewhen static loader linking is possible; a new
VP_CAPABILITIES_CREATE_DYNAMIC_BITflag covers the dynamic loading case.Update tests, the mock Vulkan API, and the generated library template to use the new two-step init/load flow.
AI Free