Merge "[vulkan] Merge in tag sdk-1.2.148.1"
diff --git a/fuchsia/loader_extensions.c b/fuchsia/loader_extensions.c
index f82ffa2..bc9c6fb 100644
--- a/fuchsia/loader_extensions.c
+++ b/fuchsia/loader_extensions.c
@@ -35,10 +35,33 @@
}
}
+typedef VkResult(VKAPI_PTR *PFN_vkOpenInNamespaceAddr)(const char *pName, uint32_t handle);
+typedef PFN_vkVoidFunction(VKAPI_PTR *PFN_vkInitializeOpenInNamespaceCallbackAddr)(PFN_vkOpenInNamespaceAddr);
+
+VKAPI_ATTR static VkResult VKAPI_CALL loader_fdio_open_in_namespace(const char *pName, uint32_t handle) {
+ // fdio_service_connect specifies READ+WRITE, which fails for read-only files
+ zx_status_t status = fdio_open(pName, ZX_FS_RIGHT_READABLE, handle);
+ if (status == ZX_OK) {
+ return VK_SUCCESS;
+ } else {
+ loader_log(NULL, VK_DEBUG_REPORT_WARNING_BIT_EXT, 0, "Failed to open in namespace %s - error %d", pName, status);
+ return VK_ERROR_INITIALIZATION_FAILED;
+ }
+}
+
void loader_initialize_icd_services(loader_platform_dl_handle handle) {
+ PFN_vkInitializeOpenInNamespaceCallbackAddr fp_initialize_open_in_namespace_callback_addr;
+
+ fp_initialize_open_in_namespace_callback_addr =
+ loader_platform_get_proc_address(handle, "vk_icdInitializeOpenInNamespaceCallback");
+ if (fp_initialize_open_in_namespace_callback_addr) {
+ fp_initialize_open_in_namespace_callback_addr(&loader_fdio_open_in_namespace);
+ return;
+ }
+
PFN_vkInitializeConnectToServiceCallbackAddr fp_initialize_connect_to_service_callback_addr;
- // TODO(fxb/60206) - rename since this can be used for opening files
+ // TODO(fxb/60206) - remove
fp_initialize_connect_to_service_callback_addr =
loader_platform_get_proc_address(handle, "vk_icdInitializeConnectToServiceCallback");
if (!fp_initialize_connect_to_service_callback_addr) {
