diff options
| author | cstout <cstout@google.com> | 2020-10-01 14:09:51 +0000 |
|---|---|---|
| committer | cstout <cstout@google.com> | 2020-10-01 14:09:51 +0000 |
| commit | 16dbce711df7ed86dd4f2960af335c461c0d6127 (patch) | |
| tree | 6d14053ede9676802fae5017aed7eb0c5a2ed2ff | |
| parent | 4b18053d54987324b93870c34d275526035cfc44 (diff) | |
| download | device_generic_goldfish-opengl-16dbce711df7ed86dd4f2960af335c461c0d6127.tar.gz device_generic_goldfish-opengl-16dbce711df7ed86dd4f2960af335c461c0d6127.tar.bz2 device_generic_goldfish-opengl-16dbce711df7ed86dd4f2960af335c461c0d6127.zip | |
Revert "Switch to vk_icdInitializeOpenInNamespaceCallback"
This reverts commit 4b18053d54987324b93870c34d275526035cfc44.
Reason for revert: Fails Fuchsia CQ because some prebuilts have not yet adopted the new Vulkan Loader. Will restore ASAP.
Change-Id: I7fcf5a4c765a8fb6bec262fabe7d08759abf34b2
| -rw-r--r-- | system/vulkan/goldfish_vulkan.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system/vulkan/goldfish_vulkan.cpp b/system/vulkan/goldfish_vulkan.cpp index 3778d27b..821a68a9 100644 --- a/system/vulkan/goldfish_vulkan.cpp +++ b/system/vulkan/goldfish_vulkan.cpp @@ -785,11 +785,11 @@ vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t* pSupportedVersion) { return VK_SUCCESS; } -typedef VkResult(VKAPI_PTR *PFN_vkOpenInNamespaceAddr)(const char *pName, uint32_t handle); +typedef VkResult(VKAPI_PTR *PFN_vkConnectToServiceAddr)(const char *pName, uint32_t handle); namespace { -PFN_vkOpenInNamespaceAddr g_vulkan_connector; +PFN_vkConnectToServiceAddr g_vulkan_connector; zx_handle_t LocalConnectToServiceFunction(const char* pName) { zx::channel remote_endpoint, local_endpoint; @@ -808,7 +808,7 @@ zx_handle_t LocalConnectToServiceFunction(const char* pName) { } extern "C" __attribute__((visibility("default"))) void -vk_icdInitializeOpenInNamespaceCallback(PFN_vkOpenInNamespaceAddr callback) { +vk_icdInitializeConnectToServiceCallback(PFN_vkConnectToServiceAddr callback) { g_vulkan_connector = callback; SetConnectToServiceFunction(&LocalConnectToServiceFunction); } |