| commit | ac5bcdb3c6f2d24c7c0976588d8dff3b190d4345 | [log] [tgz] |
|---|---|---|
| author | Jamie Madill <jmadill@chromium.org> | Mon Aug 02 18:04:49 2021 -0400 |
| committer | Angle LUCI CQ <angle-scoped@luci-project-accounts.iam.gserviceaccount.com> | Tue Aug 03 11:41:22 2021 +0000 |
| tree | b14bf70a58c6e29aed97d257f57a10f759038580 | |
| parent | 262dc97c41c674d12ca5abeff2974dbc76f68439 [diff] |
Vulkan: Use custom volk init function. This should ensure we're using ANGLE's version of the loader. Bug: chromium:1235314 Change-Id: Ia7318a922e192ce669a8cece070ab518ea421fd5 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3067511 Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
diff --git a/src/libANGLE/renderer/vulkan/RendererVk.cpp b/src/libANGLE/renderer/vulkan/RendererVk.cpp index 083fb3f..a183c06 100644 --- a/src/libANGLE/renderer/vulkan/RendererVk.cpp +++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
@@ -846,7 +846,7 @@ mLibVulkanLibrary->getAs("vkGetInstanceProcAddr", &vulkanLoaderGetInstanceProcAddr); // Set all vk* function ptrs - ANGLE_VK_TRY(displayVk, volkInitialize()); + volkInitializeCustom(vulkanLoaderGetInstanceProcAddr); uint32_t ver = volkGetInstanceVersion(); if (!IsAndroid() && VK_API_VERSION_MAJOR(ver) == 1 &&