mirror/vk-bootstrap
1
0
Fork 0
mirror of https://github.com/charles-lunarg/vk-bootstrap.git synced 2024-11-26 08:44:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

InstanceBuilder now validates the apiVersion passed in and returns and error if the version is unsupported

Browse Source
This commit is contained in:
Charles Giessen 2020-03-08 00:14:36 -07:00
parent 40488fc7cd
commit bb312e8c92
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/VkBootstrap.cpp
View File

@ -172,6 +172,8 @@ const char* validation_layer_name = "VK_LAYER_KHRONOS_validation";
const char* to_string (InstanceError err) { const char* to_string (InstanceError err) {
switch (err) { switch (err) {
case InstanceError::unavailable_vulkan_version:
return "unavailable_vulkan_version";
case InstanceError::failed_create_debug_messenger: case InstanceError::failed_create_debug_messenger:
return "failed_create_debug_messenger"; return "failed_create_debug_messenger";
case InstanceError::failed_create_instance: case InstanceError::failed_create_instance:
@ -276,6 +278,19 @@ SystemInfo InstanceBuilder::get_system_info () const { return system; }
detail::Expected<Instance, detail::Error<InstanceError>> InstanceBuilder::build () const { detail::Expected<Instance, detail::Error<InstanceError>> InstanceBuilder::build () const {
if (VK_VERSION_MINOR (info.api_version) > 0) {
PFN_vkEnumerateInstanceVersion pfn_vkEnumerateInstanceVersion;
detail::get_inst_proc_addr (
pfn_vkEnumerateInstanceVersion, "vkEnumerateInstanceVersion", nullptr, vkGetInstanceProcAddr);
if (pfn_vkEnumerateInstanceVersion == nullptr) {
return detail::Error<InstanceError>{ InstanceError::unavailable_vulkan_version };
} else if (pfn_vkEnumerateInstanceVersion != nullptr) {
uint32_t api_version = 0;
pfn_vkEnumerateInstanceVersion (&api_version);
if (VK_VERSION_MINOR (api_version) < VK_VERSION_MINOR (info.api_version))
return detail::Error<InstanceError>{ InstanceError::unavailable_vulkan_version };
}
}
VkApplicationInfo app_info = {}; VkApplicationInfo app_info = {};
app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
app_info.pNext = nullptr; app_info.pNext = nullptr;

1
src/VkBootstrap.h
View File

@ -98,6 +98,7 @@ template <typename E, typename U> class Expected {
} // namespace detail } // namespace detail
enum class InstanceError { enum class InstanceError {
unavailable_vulkan_version,
failed_create_instance, failed_create_instance,
failed_create_debug_messenger, failed_create_debug_messenger,
requested_layers_not_present, requested_layers_not_present,