diff options
author | Alex Smith <[email protected]> | 2017-06-06 16:09:07 +0100 |
---|---|---|
committer | Jason Ekstrand <[email protected]> | 2017-06-06 08:19:55 -0700 |
commit | dc6182fa3fea0de025f29591b9fd053fffe8bf8b (patch) | |
tree | 05143f85f1b935a38e7137184eed3575f62bc786 /src/vulkan/util | |
parent | 621b3410f5f88e2a3743bc025b100717cac26e63 (diff) |
radv/vulkan: Move radv_get_driver_version to src/vulkan/util
This means it can be reused for other Vulkan drivers. Also fix up a
typo, need to search for '.' in the version string rather than ','.
v2: Remove unneeded temporary version variable (Emil, Eric)
Signed-off-by: Alex Smith <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/vulkan/util')
-rw-r--r-- | src/vulkan/util/vk_util.c | 49 | ||||
-rw-r--r-- | src/vulkan/util/vk_util.h | 2 |
2 files changed, 51 insertions, 0 deletions
diff --git a/src/vulkan/util/vk_util.c b/src/vulkan/util/vk_util.c new file mode 100644 index 00000000000..769e69062ad --- /dev/null +++ b/src/vulkan/util/vk_util.c @@ -0,0 +1,49 @@ +/* + * Copyright © 2016 Red Hat. + * Copyright © 2016 Bas Nieuwenhuizen + * Copyright © 2017 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include <stdlib.h> +#include <string.h> +#include "vk_util.h" + +uint32_t vk_get_driver_version(void) +{ + const char *minor_string = strchr(VERSION, '.'); + const char *patch_string = minor_string ? strchr(minor_string + 1, '.') : NULL; + int major = atoi(VERSION); + int minor = minor_string ? atoi(minor_string + 1) : 0; + int patch = patch_string ? atoi(patch_string + 1) : 0; + if (strstr(VERSION, "devel")) { + if (patch == 0) { + patch = 99; + if (minor == 0) { + minor = 99; + --major; + } else + --minor; + } else + --patch; + } + return VK_MAKE_VERSION(major, minor, patch); +} diff --git a/src/vulkan/util/vk_util.h b/src/vulkan/util/vk_util.h index 5ff1f00195c..2ed601f881e 100644 --- a/src/vulkan/util/vk_util.h +++ b/src/vulkan/util/vk_util.h @@ -197,4 +197,6 @@ __vk_find_struct(void *start, VkStructureType sType) #define vk_find_struct_const(__start, __sType) \ (const void *)__vk_find_struct((void *)(__start), VK_STRUCTURE_TYPE_##__sType) +uint32_t vk_get_driver_version(void); + #endif /* VK_UTIL_H */ |