mirror of
https://github.com/charles-lunarg/vk-bootstrap.git
synced 2024-11-22 15:24:34 +00:00
Fixed a bug where user provided vkGetInstanceProcAddr pfn's were being ignored. Cleaned up un-needed locks.
This commit is contained in:
parent
b3fdd554b4
commit
87a63e942c
@ -168,13 +168,10 @@ class VulkanFunctions {
|
|||||||
}
|
}
|
||||||
|
|
||||||
template <typename T> void get_inst_proc_addr(T& out_ptr, const char* func_name) {
|
template <typename T> void get_inst_proc_addr(T& out_ptr, const char* func_name) {
|
||||||
std::lock_guard<std::mutex> lg(init_mutex);
|
|
||||||
get_proc_addr(out_ptr, func_name);
|
get_proc_addr(out_ptr, func_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
void init_instance_funcs(VkInstance inst) {
|
void init_instance_funcs(VkInstance inst) {
|
||||||
std::lock_guard<std::mutex> lg(init_mutex);
|
|
||||||
|
|
||||||
instance = inst;
|
instance = inst;
|
||||||
get_proc_addr(fp_vkDestroyInstance, "vkDestroyInstance");
|
get_proc_addr(fp_vkDestroyInstance, "vkDestroyInstance");
|
||||||
get_proc_addr(fp_vkEnumeratePhysicalDevices, "vkEnumeratePhysicalDevices");
|
get_proc_addr(fp_vkEnumeratePhysicalDevices, "vkEnumeratePhysicalDevices");
|
||||||
@ -583,7 +580,7 @@ InstanceBuilder::InstanceBuilder() {}
|
|||||||
|
|
||||||
detail::Result<Instance> InstanceBuilder::build() const {
|
detail::Result<Instance> InstanceBuilder::build() const {
|
||||||
|
|
||||||
auto sys_info_ret = SystemInfo::get_system_info();
|
auto sys_info_ret = SystemInfo::get_system_info(info.fp_vkGetInstanceProcAddr);
|
||||||
if (!sys_info_ret) return sys_info_ret.error();
|
if (!sys_info_ret) return sys_info_ret.error();
|
||||||
auto system = sys_info_ret.value();
|
auto system = sys_info_ret.value();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user