Commit 76ca9f36 by angle-autoroll Committed by Commit Bot

Roll Vulkan-Loader from 428654245ad3 to 07bbf14a831b (2 revisions)

https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader.git/+log/428654245ad3..07bbf14a831b 2020-10-30 shabbyx@gmail.com Revert "Generate libvulkan.so.1 on Linux instead of libvulkan.so" 2020-10-30 xantares09@hotmail.com Add an option to disable MASM Bug: angleproject:5216 Bug: chromium:1143750 Bug: chromium:843346 Change-Id: I39a62314bef79c7f81f15e99b1c1b8709a107e40 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2512405Reviewed-by: 's avatarShahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
parent 09932e04
...@@ -86,7 +86,7 @@ vars = { ...@@ -86,7 +86,7 @@ vars = {
'vulkan_headers_revision': '320af06cbdd29848e1d7100d9b8e4e517db1dfd5', 'vulkan_headers_revision': '320af06cbdd29848e1d7100d9b8e4e517db1dfd5',
# Current revision of Khronos Vulkan-Loader. # Current revision of Khronos Vulkan-Loader.
'vulkan_loader_revision': '428654245ad33f936a680c090b4ddcd096aefaf6', 'vulkan_loader_revision': '07bbf14a831bfed70ea2048aac050138e5995f57',
# Current revision of Khronos Vulkan-Tools. # Current revision of Khronos Vulkan-Tools.
'vulkan_tools_revision': 'ee0de094ddff8573a06b36b7fa7922de21ea372c', 'vulkan_tools_revision': 'ee0de094ddff8573a06b36b7fa7922de21ea372c',
......
...@@ -62,9 +62,9 @@ VkResult volkInitialize(void) ...@@ -62,9 +62,9 @@ VkResult volkInitialize(void)
vkGetInstanceProcAddr = (PFN_vkGetInstanceProcAddr)dlsym(module, "vkGetInstanceProcAddr"); vkGetInstanceProcAddr = (PFN_vkGetInstanceProcAddr)dlsym(module, "vkGetInstanceProcAddr");
#else #else
void* module = dlopen("libvulkan.so.1", RTLD_NOW | RTLD_LOCAL); void* module = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
if (!module) if (!module)
module = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL); module = dlopen("libvulkan.so.1", RTLD_NOW | RTLD_LOCAL);
if (!module) if (!module)
return VK_ERROR_INITIALIZATION_FAILED; return VK_ERROR_INITIALIZATION_FAILED;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment