From a38bdae396b7ca29a5b4f670f1a4e987f2fdafbd Mon Sep 17 00:00:00 2001 From: Constantine Shablya Date: Tue, 24 Jan 2023 03:22:38 +0200 Subject: [PATCH] [embedder] Fix getting vkGetInstanceProcAddr (flutter/engine#39051) --- engine/src/flutter/shell/platform/embedder/embedder.cc | 2 +- .../shell/platform/embedder/tests/embedder_config_builder.cc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/engine/src/flutter/shell/platform/embedder/embedder.cc b/engine/src/flutter/shell/platform/embedder/embedder.cc index 9888ad66768..956448c2375 100644 --- a/engine/src/flutter/shell/platform/embedder/embedder.cc +++ b/engine/src/flutter/shell/platform/embedder/embedder.cc @@ -562,7 +562,7 @@ InferVulkanPlatformViewCreationCallback( auto vk_instance = static_cast(config->vulkan.instance); auto proc_addr = - vulkan_get_instance_proc_address(vk_instance, "GetInstanceProcAddr"); + vulkan_get_instance_proc_address(vk_instance, "vkGetInstanceProcAddr"); flutter::EmbedderSurfaceVulkan::VulkanDispatchTable vulkan_dispatch_table = { .get_instance_proc_address = diff --git a/engine/src/flutter/shell/platform/embedder/tests/embedder_config_builder.cc b/engine/src/flutter/shell/platform/embedder/tests/embedder_config_builder.cc index d61b5ffb633..32d5ffa2d1d 100644 --- a/engine/src/flutter/shell/platform/embedder/tests/embedder_config_builder.cc +++ b/engine/src/flutter/shell/platform/embedder/tests/embedder_config_builder.cc @@ -513,7 +513,8 @@ void EmbedderConfigBuilder::InitializeVulkanRendererConfig() { [](void* context, FlutterVulkanInstanceHandle instance, const char* name) -> void* { auto proc_addr = reinterpret_cast(context) - ->vulkan_context_->vk_->GetInstanceProcAddr; + ->vulkan_context_->vk_->GetInstanceProcAddr( + reinterpret_cast(instance), name); return reinterpret_cast(proc_addr); }; vulkan_renderer_config_.get_next_image_callback =