mirror/vk-bootstrap
1
0
Fork 0
mirror of https://github.com/charles-lunarg/vk-bootstrap.git synced 2024-11-10 02:41:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Trimmed branching in script and modified usage in core lib.

Browse Source
This commit is contained in:
Cody Goodson 2021-06-03 13:46:27 -05:00 committed by Charles Giessen
parent dd1df1396c
commit a61e221d59
5 changed files with 52 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
script/generate_dispatch.py
View File

@ -91,10 +91,11 @@ for feature_node in features_node:
for require_node in feature_node['require']:
for param_node in require_node:
if param_node == 'command':
if type(require_node[param_node]) is list:
for param in require_node[param_node]:
if param['@name'] in device_commands:
device_commands[param['@name']]['requirements'] += [[feature_node['@name']]]
if type(require_node[param_node]) is not list:
require_node[param_node] = [require_node[param_node]]
for param in require_node[param_node]:
if param['@name'] in device_commands:
device_commands[param['@name']]['requirements'] += [[feature_node['@name']]]
# Add requirements for extension PFN's
@ -112,20 +113,16 @@ for extension_node in extensions_node:
if '@extension' in require_node.keys():
requirements.append(require_node['@extension'])
if type(require_node['command']) is not list:
if require_node['command']['@name'] in device_commands:
device_commands[require_node['command']['@name']]['requirements'] += [requirements]
else:
for command_node in require_node['command']:
if command_node['@name'] in device_commands:
device_commands[command_node['@name']]['requirements'] += [requirements]
elif require_node == 'command':
if type(require_nodes['command']) is not list:
if require_nodes['command']['@name'] in device_commands:
device_commands[require_nodes['command']['@name']]['requirements'] += [requirements]
else:
for command_node in require_nodes['command']:
require_node['command'] = [require_node['command']]
for command_node in require_node['command']:
if command_node['@name'] in device_commands:
device_commands[command_node['@name']]['requirements'] += [requirements]
elif require_node == 'command':
if type(require_nodes['command']) is not list:
require_nodes['command'] = [require_nodes['command']]
for command_node in require_nodes['command']:
if command_node['@name'] in device_commands:
device_commands[command_node['@name']]['requirements'] += [requirements]
# Generate macro templates
for command in device_commands:

13
src/VkBootstrap.cpp
View File

@ -1308,12 +1308,6 @@ std::vector<VkQueueFamilyProperties> PhysicalDevice::get_queue_families() const
return queue_families;
}
// --- DispatchTable --- //
DispatchTable Device::get_dispatch_table() const {
return DispatchTable(device, detail::vulkan_functions().fp_vkGetDeviceProcAddr);
}
// ---- Queues ---- //
detail::Result<uint32_t> Device::get_queue_index(QueueType type) const {
@ -1484,6 +1478,9 @@ detail::Result<Device> DeviceBuilder::build() const {
device.queue_families = physical_device.queue_families;
device.allocation_callbacks = info.allocation_callbacks;
device.fp_vkGetDeviceProcAddr = detail::vulkan_functions().fp_vkGetDeviceProcAddr;
if(info.load_dispatch) {
device.dispatch = DispatchTable(device.device, device.fp_vkGetDeviceProcAddr);
}
return device;
}
DeviceBuilder& DeviceBuilder::custom_queue_setup(std::vector<CustomQueueDescription> queue_descriptions) {
@ -1494,6 +1491,10 @@ DeviceBuilder& DeviceBuilder::set_allocation_callbacks(VkAllocationCallbacks* ca
info.allocation_callbacks = callbacks;
return *this;
}
DeviceBuilder& DeviceBuilder::populate_dispatch_table() {
info.load_dispatch = true;
return *this;
}
// ---- Swapchain ---- //

7
src/VkBootstrap.h
View File

@ -214,7 +214,6 @@ struct Instance {
VkInstance instance = VK_NULL_HANDLE;
VkDebugUtilsMessengerEXT debug_messenger = VK_NULL_HANDLE;
VkAllocationCallbacks* allocation_callbacks = VK_NULL_HANDLE;
PFN_vkGetInstanceProcAddr fp_vkGetInstanceProcAddr = nullptr;
PFN_vkGetDeviceProcAddr fp_vkGetDeviceProcAddr = nullptr;
@ -544,8 +543,7 @@ struct Device {
std::vector<VkQueueFamilyProperties> queue_families;
VkAllocationCallbacks* allocation_callbacks = VK_NULL_HANDLE;
PFN_vkGetDeviceProcAddr fp_vkGetDeviceProcAddr = nullptr;
DispatchTable get_dispatch_table() const;
DispatchTable dispatch;
detail::Result<uint32_t> get_queue_index(QueueType type) const;
// Only a compute or transfer queue type is valid. All other queue types do not support a 'dedicated' queue index
@ -587,6 +585,8 @@ class DeviceBuilder {
// Provide custom allocation callbacks.
DeviceBuilder& set_allocation_callbacks(VkAllocationCallbacks* callbacks);
// Populate dispatch table for the device
DeviceBuilder& populate_dispatch_table();
private:
PhysicalDevice physical_device;
struct DeviceInfo {
@ -594,6 +594,7 @@ class DeviceBuilder {
std::vector<VkBaseOutStructure*> pNext_chain;
std::vector<CustomQueueDescription> queue_descriptions;
VkAllocationCallbacks* allocation_callbacks = VK_NULL_HANDLE;
bool load_dispatch = false;
} info;
};

42
src/VkDispatchTable.h
View File

@ -60,7 +60,7 @@ struct DispatchTable {
fp_vkCreateQueryPool = (PFN_vkCreateQueryPool)procAddr(device, "vkCreateQueryPool");
fp_vkDestroyQueryPool = (PFN_vkDestroyQueryPool)procAddr(device, "vkDestroyQueryPool");
fp_vkGetQueryPoolResults = (PFN_vkGetQueryPoolResults)procAddr(device, "vkGetQueryPoolResults");
#if (defined(VK_EXT_host_query_reset))
#if (defined(VK_VERSION_1_2)) || (defined(VK_EXT_host_query_reset))
fp_vkResetQueryPool = (PFN_vkResetQueryPool)procAddr(device, "vkResetQueryPool");
#endif
fp_vkCreateBuffer = (PFN_vkCreateBuffer)procAddr(device, "vkCreateBuffer");
@ -213,7 +213,7 @@ struct DispatchTable {
#if (defined(VK_KHR_push_descriptor))
fp_vkCmdPushDescriptorSetKHR = (PFN_vkCmdPushDescriptorSetKHR)procAddr(device, "vkCmdPushDescriptorSetKHR");
#endif
#if (defined(VK_KHR_maintenance1))
#if (defined(VK_VERSION_1_1)) || (defined(VK_KHR_maintenance1))
fp_vkTrimCommandPool = (PFN_vkTrimCommandPool)procAddr(device, "vkTrimCommandPool");
#endif
#if (defined(VK_KHR_external_memory_win32))
@ -348,7 +348,9 @@ struct DispatchTable {
#if (defined(VK_VERSION_1_1)) || (defined(VK_KHR_sampler_ycbcr_conversion))
fp_vkDestroySamplerYcbcrConversion = (PFN_vkDestroySamplerYcbcrConversion)procAddr(device, "vkDestroySamplerYcbcrConversion");
#endif
#if (defined(VK_VERSION_1_1))
fp_vkGetDeviceQueue2 = (PFN_vkGetDeviceQueue2)procAddr(device, "vkGetDeviceQueue2");
#endif
#if (defined(VK_EXT_validation_cache))
fp_vkCreateValidationCacheEXT = (PFN_vkCreateValidationCacheEXT)procAddr(device, "vkCreateValidationCacheEXT");
#endif
@ -361,7 +363,7 @@ struct DispatchTable {
#if (defined(VK_EXT_validation_cache))
fp_vkMergeValidationCachesEXT = (PFN_vkMergeValidationCachesEXT)procAddr(device, "vkMergeValidationCachesEXT");
#endif
#if (defined(VK_KHR_maintenance3))
#if (defined(VK_VERSION_1_1)) || (defined(VK_KHR_maintenance3))
fp_vkGetDescriptorSetLayoutSupport = (PFN_vkGetDescriptorSetLayoutSupport)procAddr(device, "vkGetDescriptorSetLayoutSupport");
#endif
#if (defined(VK_ANDROID_native_buffer))
@ -850,10 +852,10 @@ struct DispatchTable {
#if (defined(VK_NVX_binary_import))
fp_vkCmdCuLaunchKernelNVX = (PFN_vkCmdCuLaunchKernelNVX)procAddr(device, "vkCmdCuLaunchKernelNVX");
#endif
#if (defined(VK_EXT_host_query_reset))
#if (defined(VK_VERSION_1_2)) || (defined(VK_EXT_host_query_reset))
fp_vkResetQueryPoolEXT = (PFN_vkResetQueryPoolEXT)procAddr(device, "vkResetQueryPoolEXT");
#endif
#if (defined(VK_KHR_maintenance1))
#if (defined(VK_VERSION_1_1)) || (defined(VK_KHR_maintenance1))
fp_vkTrimCommandPoolKHR = (PFN_vkTrimCommandPoolKHR)procAddr(device, "vkTrimCommandPoolKHR");
#endif
#if (defined(VK_VERSION_1_1)) || (defined(VK_KHR_device_group))
@ -895,7 +897,7 @@ struct DispatchTable {
#if (defined(VK_VERSION_1_1)) || (defined(VK_KHR_sampler_ycbcr_conversion))
fp_vkDestroySamplerYcbcrConversionKHR = (PFN_vkDestroySamplerYcbcrConversionKHR)procAddr(device, "vkDestroySamplerYcbcrConversionKHR");
#endif
#if (defined(VK_KHR_maintenance3))
#if (defined(VK_VERSION_1_1)) || (defined(VK_KHR_maintenance3))
fp_vkGetDescriptorSetLayoutSupportKHR = (PFN_vkGetDescriptorSetLayoutSupportKHR)procAddr(device, "vkGetDescriptorSetLayoutSupportKHR");
#endif
#if (defined(VK_VERSION_1_2)) || (defined(VK_KHR_create_renderpass2))
@ -1034,7 +1036,7 @@ struct DispatchTable {
VkResult getQueryPoolResults(VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, size_t dataSize, void* pData, VkDeviceSize stride, VkQueryResultFlags flags) const {
return fp_vkGetQueryPoolResults(device, queryPool, firstQuery, queryCount, dataSize, pData, stride, flags);
}
#if (defined(VK_EXT_host_query_reset))
#if (defined(VK_VERSION_1_2)) || (defined(VK_EXT_host_query_reset))
void resetQueryPool(VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount) const {
fp_vkResetQueryPool(device, queryPool, firstQuery, queryCount);
}
@ -1405,7 +1407,7 @@ struct DispatchTable {
fp_vkCmdPushDescriptorSetKHR(commandBuffer, pipelineBindPoint, layout, set, descriptorWriteCount, pDescriptorWrites);
}
#endif
#if (defined(VK_KHR_maintenance1))
#if (defined(VK_VERSION_1_1)) || (defined(VK_KHR_maintenance1))
void trimCommandPool(VkCommandPool commandPool, VkCommandPoolTrimFlags flags) const {
fp_vkTrimCommandPool(device, commandPool, flags);
}
@ -1630,9 +1632,11 @@ struct DispatchTable {
fp_vkDestroySamplerYcbcrConversion(device, ycbcrConversion, pAllocator);
}
#endif
#if (defined(VK_VERSION_1_1))
void getDeviceQueue2(const VkDeviceQueueInfo2* pQueueInfo, VkQueue* pQueue) const {
fp_vkGetDeviceQueue2(device, pQueueInfo, pQueue);
}
#endif
#if (defined(VK_EXT_validation_cache))
VkResult createValidationCacheEXT(const VkValidationCacheCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkValidationCacheEXT* pValidationCache) const {
return fp_vkCreateValidationCacheEXT(device, pCreateInfo, pAllocator, pValidationCache);
@ -1653,7 +1657,7 @@ struct DispatchTable {
return fp_vkMergeValidationCachesEXT(device, dstCache, srcCacheCount, pSrcCaches);
}
#endif
#if (defined(VK_KHR_maintenance3))
#if (defined(VK_VERSION_1_1)) || (defined(VK_KHR_maintenance3))
void getDescriptorSetLayoutSupport(const VkDescriptorSetLayoutCreateInfo* pCreateInfo, VkDescriptorSetLayoutSupport* pSupport) const {
fp_vkGetDescriptorSetLayoutSupport(device, pCreateInfo, pSupport);
}
@ -2468,12 +2472,12 @@ struct DispatchTable {
fp_vkCmdCuLaunchKernelNVX(commandBuffer, pLaunchInfo);
}
#endif
#if (defined(VK_EXT_host_query_reset))
#if (defined(VK_VERSION_1_2)) || (defined(VK_EXT_host_query_reset))
void resetQueryPoolEXT(VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount) const {
fp_vkResetQueryPoolEXT(device, queryPool, firstQuery, queryCount);
}
#endif
#if (defined(VK_KHR_maintenance1))
#if (defined(VK_VERSION_1_1)) || (defined(VK_KHR_maintenance1))
void trimCommandPoolKHR(VkCommandPool commandPool, VkCommandPoolTrimFlags flags) const {
fp_vkTrimCommandPoolKHR(device, commandPool, flags);
}
@ -2543,7 +2547,7 @@ struct DispatchTable {
fp_vkDestroySamplerYcbcrConversionKHR(device, ycbcrConversion, pAllocator);
}
#endif
#if (defined(VK_KHR_maintenance3))
#if (defined(VK_VERSION_1_1)) || (defined(VK_KHR_maintenance3))
void getDescriptorSetLayoutSupportKHR(const VkDescriptorSetLayoutCreateInfo* pCreateInfo, VkDescriptorSetLayoutSupport* pSupport) const {
fp_vkGetDescriptorSetLayoutSupportKHR(device, pCreateInfo, pSupport);
}
@ -2645,7 +2649,7 @@ struct DispatchTable {
PFN_vkCreateQueryPool fp_vkCreateQueryPool = nullptr;
PFN_vkDestroyQueryPool fp_vkDestroyQueryPool = nullptr;
PFN_vkGetQueryPoolResults fp_vkGetQueryPoolResults = nullptr;
#if (defined(VK_EXT_host_query_reset))
#if (defined(VK_VERSION_1_2)) || (defined(VK_EXT_host_query_reset))
PFN_vkResetQueryPool fp_vkResetQueryPool = nullptr;
#endif
PFN_vkCreateBuffer fp_vkCreateBuffer = nullptr;
@ -2798,7 +2802,7 @@ struct DispatchTable {
#if (defined(VK_KHR_push_descriptor))
PFN_vkCmdPushDescriptorSetKHR fp_vkCmdPushDescriptorSetKHR = nullptr;
#endif
#if (defined(VK_KHR_maintenance1))
#if (defined(VK_VERSION_1_1)) || (defined(VK_KHR_maintenance1))
PFN_vkTrimCommandPool fp_vkTrimCommandPool = nullptr;
#endif
#if (defined(VK_KHR_external_memory_win32))
@ -2933,7 +2937,9 @@ struct DispatchTable {
#if (defined(VK_VERSION_1_1)) || (defined(VK_KHR_sampler_ycbcr_conversion))
PFN_vkDestroySamplerYcbcrConversion fp_vkDestroySamplerYcbcrConversion = nullptr;
#endif
#if (defined(VK_VERSION_1_1))
PFN_vkGetDeviceQueue2 fp_vkGetDeviceQueue2 = nullptr;
#endif
#if (defined(VK_EXT_validation_cache))
PFN_vkCreateValidationCacheEXT fp_vkCreateValidationCacheEXT = nullptr;
#endif
@ -2946,7 +2952,7 @@ struct DispatchTable {
#if (defined(VK_EXT_validation_cache))
PFN_vkMergeValidationCachesEXT fp_vkMergeValidationCachesEXT = nullptr;
#endif
#if (defined(VK_KHR_maintenance3))
#if (defined(VK_VERSION_1_1)) || (defined(VK_KHR_maintenance3))
PFN_vkGetDescriptorSetLayoutSupport fp_vkGetDescriptorSetLayoutSupport = nullptr;
#endif
#if (defined(VK_ANDROID_native_buffer))
@ -3435,10 +3441,10 @@ struct DispatchTable {
#if (defined(VK_NVX_binary_import))
PFN_vkCmdCuLaunchKernelNVX fp_vkCmdCuLaunchKernelNVX = nullptr;
#endif
#if (defined(VK_EXT_host_query_reset))
#if (defined(VK_VERSION_1_2)) || (defined(VK_EXT_host_query_reset))
PFN_vkResetQueryPoolEXT fp_vkResetQueryPoolEXT = nullptr;
#endif
#if (defined(VK_KHR_maintenance1))
#if (defined(VK_VERSION_1_1)) || (defined(VK_KHR_maintenance1))
PFN_vkTrimCommandPoolKHR fp_vkTrimCommandPoolKHR = nullptr;
#endif
#if (defined(VK_VERSION_1_1)) || (defined(VK_KHR_device_group))
@ -3480,7 +3486,7 @@ struct DispatchTable {
#if (defined(VK_VERSION_1_1)) || (defined(VK_KHR_sampler_ycbcr_conversion))
PFN_vkDestroySamplerYcbcrConversionKHR fp_vkDestroySamplerYcbcrConversionKHR = nullptr;
#endif
#if (defined(VK_KHR_maintenance3))
#if (defined(VK_VERSION_1_1)) || (defined(VK_KHR_maintenance3))
PFN_vkGetDescriptorSetLayoutSupportKHR fp_vkGetDescriptorSetLayoutSupportKHR = nullptr;
#endif
#if (defined(VK_VERSION_1_2)) || (defined(VK_KHR_create_renderpass2))

9
tests/bootstrap_tests.cpp
View File

@ -200,20 +200,19 @@ TEST_CASE("Loading Dispatch Table", "[VkBootstrap.bootstrap]") {
REQUIRE(phys_dev_ret.has_value());
vkb::DeviceBuilder device_builder(phys_dev_ret.value());
auto device_ret = device_builder.build();
auto device_ret = device_builder.populate_dispatch_table().build();
REQUIRE(device_ret.has_value());
vkb::DispatchTable table = device_ret->get_dispatch_table();
auto device = device_ret.value();
// Create a basic Device specific type to test with
VkFenceCreateInfo info{};
info.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO;
VkFence fence = VK_NULL_HANDLE;
table.createFence(&info, nullptr, &fence);
device.dispatch.createFence(&info, nullptr, &fence);
REQUIRE(fence != VK_NULL_HANDLE);
table.destroyFence(fence, nullptr);
device.dispatch.destroyFence(fence, nullptr);
vkb::destroy_device(device_ret.value());
}
vkb::destroy_instance(instance_ret.value());