Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix vulkan windows; Make test succeed w/o driver 

Fix an error in the windows vulkan_sdk library finding.
Also don't fail the vulkan test only because no vulkan
driver is installed (should fix the travis error).
This commit is contained in:
nyorain 2017-07-27 12:05:08 +02:00
parent 02e5c58efc
commit 6dd9098cd7
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mesonbuild/dependencies/ui.py
View File

@ -538,10 +538,13 @@ class VulkanDependency(ExternalDependency):
inc_path = os.path.join(self.vulkan_sdk, inc_dir) inc_path = os.path.join(self.vulkan_sdk, inc_dir)
header = os.path.join(inc_path, 'vulkan', 'vulkan.h') header = os.path.join(inc_path, 'vulkan', 'vulkan.h')
lib_path = os.path.join(self.vulkan_sdk, lib_dir) lib_path = os.path.join(self.vulkan_sdk, lib_dir)
find_lib = self.compiler.find_library('vulkan', environment, lib_path) find_lib = self.compiler.find_library(lib_name, environment, lib_path)
if not (find_lib and os.path.isfile(header)): if not find_lib:
raise DependencyException('VULKAN_SDK point to invalid directory') raise DependencyException('VULKAN_SDK point to invalid directory (no lib)')
if not os.path.isfile(header):
raise DependencyException('VULKAN_SDK point to invalid directory (no include)')
self.type_name = 'vulkan_sdk' self.type_name = 'vulkan_sdk'
self.is_found = True self.is_found = True

12
test cases/frameworks/17 vulkan/vulkanprog.c
View File

@ -14,13 +14,13 @@ int main()
NULL, NULL,
}; };
// we don't actually require instance creation to succeed since
// we cannot expect test environments to have a vulkan driver installed.
// As long as this does not produce as segmentation fault or similar,
// everything's alright.
VkInstance instance; VkInstance instance;
VkResult ret = vkCreateInstance(&instance_create_info, NULL, &instance); if(vkCreateInstance(&instance_create_info, NULL, &instance) == VK_SUCCESS)
if(ret != VK_SUCCESS) {
printf("Could not create vulkan instance: %d\n", ret);
return ret;
}
vkDestroyInstance(instance, NULL); vkDestroyInstance(instance, NULL);
return 0; return 0;
} }