everythign except vulkan functions pass

Author: iskakaushik

flutter_vma/flutter_skia_vma.cc

@@ -45,6 +45,11 @@ sk_sp<skgpu::VulkanMemoryAllocator> FlutterSkiaVulkanMemoryAllocator::Make(
   proc_table.vkCreateImage = vk->CreateImage;
   proc_table.vkDestroyImage = vk->DestroyImage;
   proc_table.vkCmdCopyBuffer = vk->CmdCopyBuffer;
+  proc_table.vkGetBufferMemoryRequirements2KHR = vk->GetBufferMemoryRequirements2KHR;
+  proc_table.vkGetImageMemoryRequirements2KHR = vk->GetImageMemoryRequirements2KHR;
+  proc_table.vkBindBufferMemory2KHR = vk->BindBufferMemory2KHR;
+  proc_table.vkBindImageMemory2KHR = vk->BindImageMemory2KHR;
+  proc_table.vkGetPhysicalDeviceMemoryProperties2KHR = vk->GetPhysicalDeviceMemoryProperties2KHR;
   // clang-format on
 
   VmaAllocatorCreateInfo allocator_info = {};

shell/common/shell_test_platform_view_vulkan.cc

@@ -7,6 +7,7 @@
 #include <utility>
 
 #include "flutter/common/graphics/persistent_cache.h"
+#include "flutter/flutter_vma/flutter_skia_vma.h"
 #include "flutter/shell/common/context_options.h"
 #include "flutter/vulkan/vulkan_skia_proc_table.h"
 #include "flutter/vulkan/vulkan_utilities.h"
@@ -112,6 +113,11 @@ ShellTestPlatformViewVulkan::OffScreenSurface::OffScreenSurface(
     return;
   }
 
+  memory_allocator_ = FlutterSkiaVulkanMemoryAllocator::Make(
+      application_->GetAPIVersion(), application_->GetInstance(),
+      logical_device_->GetPhysicalDeviceHandle(), logical_device_->GetHandle(),
+      vk_, true);
+
   // Create the Skia GrContext.
   if (!CreateSkiaGrContext()) {
     FML_DLOG(ERROR) << "Could not create Skia context.";
@@ -172,6 +178,8 @@ bool ShellTestPlatformViewVulkan::OffScreenSurface::CreateSkiaBackendContext(
   context->fFeatures = skia_features;
   context->fGetProc = std::move(getProc);
   context->fOwnsInstanceAndDevice = false;
+  context->fMemoryAllocator = memory_allocator_;
+
   return true;
 }
 

shell/common/shell_test_platform_view_vulkan.h

@@ -10,6 +10,7 @@
 #include "flutter/shell/gpu/gpu_surface_vulkan_delegate.h"
 #include "flutter/vulkan/vulkan_application.h"
 #include "flutter/vulkan/vulkan_device.h"
+#include "flutter/vulkan/vulkan_skia_proc_table.h"
 
 namespace flutter {
 namespace testing {
@@ -54,6 +55,7 @@ class ShellTestPlatformViewVulkan : public ShellTestPlatformView {
         shell_test_external_view_embedder_;
     std::unique_ptr<vulkan::VulkanApplication> application_;
     std::unique_ptr<vulkan::VulkanDevice> logical_device_;
+    sk_sp<skgpu::VulkanMemoryAllocator> memory_allocator_;
     sk_sp<GrDirectContext> context_;
 
     bool CreateSkiaGrContext();

shell/platform/embedder/embedder.cc

@@ -556,8 +556,13 @@ InferVulkanPlatformViewCreationCallback(
     return ptr(user_data, &image_desc);
   };
 
+  auto vk_instance = static_cast<VkInstance>(config->vulkan.instance);
+  auto proc_addr =
+      vulkan_get_instance_proc_address(vk_instance, "GetInstanceProcAddr");
+
   flutter::EmbedderSurfaceVulkan::VulkanDispatchTable vulkan_dispatch_table = {
-      .get_instance_proc_address = vulkan_get_instance_proc_address,
+      .get_instance_proc_address =
+          reinterpret_cast<PFN_vkGetInstanceProcAddr>(proc_addr),
       .get_next_image = vulkan_get_next_image,
       .present_image = vulkan_present_image_callback,
   };
@@ -567,8 +572,7 @@ InferVulkanPlatformViewCreationCallback(
 
   std::unique_ptr<flutter::EmbedderSurfaceVulkan> embedder_surface =
       std::make_unique<flutter::EmbedderSurfaceVulkan>(
-          config->vulkan.version,
-          static_cast<VkInstance>(config->vulkan.instance),
+          config->vulkan.version, vk_instance,
           config->vulkan.enabled_instance_extension_count,
           config->vulkan.enabled_instance_extensions,
           config->vulkan.enabled_device_extension_count,

shell/platform/embedder/embedder_surface_vulkan.h

@@ -20,8 +20,7 @@ class EmbedderSurfaceVulkan final : public EmbedderSurface,
                                     public GPUSurfaceVulkanDelegate {
  public:
   struct VulkanDispatchTable {
-    std::function<void*(VkInstance, const char*)>
-        get_instance_proc_address;  // required
+    PFN_vkGetInstanceProcAddr get_instance_proc_address;  // required
     std::function<FlutterVulkanImage(const SkISize& frame_size)>
         get_next_image;  // required
     std::function<bool(VkImage image, VkFormat format)>

shell/platform/embedder/tests/embedder_config_builder.cc

@@ -510,9 +510,9 @@ void EmbedderConfigBuilder::InitializeVulkanRendererConfig() {
   vulkan_renderer_config_.get_instance_proc_address_callback =
       [](void* context, FlutterVulkanInstanceHandle instance,
          const char* name) -> void* {
-    return reinterpret_cast<EmbedderTestContextVulkan*>(context)
-        ->vulkan_context_->vk_->GetInstanceProcAddr(
-            reinterpret_cast<VkInstance>(instance), name);
+    auto proc_addr = reinterpret_cast<EmbedderTestContextVulkan*>(context)
+                         ->vulkan_context_->vk_->GetInstanceProcAddr;
+    return reinterpret_cast<void*>(proc_addr);
   };
   vulkan_renderer_config_.get_next_image_callback =
       [](void* context,

vulkan/procs/vulkan_proc_table.cc

@@ -26,9 +26,9 @@ VulkanProcTable::VulkanProcTable(const char* so_path)
 }
 
 VulkanProcTable::VulkanProcTable(
-    std::function<void*(VkInstance, const char*)> get_instance_proc_addr)
+    PFN_vkGetInstanceProcAddr get_instance_proc_addr)
     : handle_(nullptr), acquired_mandatory_proc_addresses_(false) {
-  GetInstanceProcAddr = std::move(get_instance_proc_addr);
+  GetInstanceProcAddr = get_instance_proc_addr;
   acquired_mandatory_proc_addresses_ = SetupLoaderProcAddresses();
 }
 
@@ -60,8 +60,7 @@ bool VulkanProcTable::SetupGetInstanceProcAddress() {
 
   FML_LOG(ERROR) << "SetupGetInstanceProcAddress: handle_ is non-null";
 
-  GetInstanceProcAddr = reinterpret_cast<void* (*)(VkInstance, const char*)>(
-      NativeGetInstanceProcAddr());
+  GetInstanceProcAddr = NativeGetInstanceProcAddr();
   if (!GetInstanceProcAddr) {
     FML_DLOG(WARNING) << "Could not acquire vkGetInstanceProcAddr.";
     return false;
@@ -71,8 +70,9 @@ bool VulkanProcTable::SetupGetInstanceProcAddress() {
 }
 
 PFN_vkGetInstanceProcAddr VulkanProcTable::NativeGetInstanceProcAddr() const {
-  FML_LOG(ERROR) << this << " - " << handle_.get()
-                 << " : NativeGetInstanceProcAddr";
+  if (GetInstanceProcAddr) {
+    return GetInstanceProcAddr;
+  }
 
 #if VULKAN_LINK_STATICALLY
   return &vkGetInstanceProcAddr;
@@ -167,6 +167,13 @@ bool VulkanProcTable::SetupDeviceProcAddresses(
   ACQUIRE_PROC(CreateBuffer, handle);
   ACQUIRE_PROC(DestroyBuffer, handle);
   ACQUIRE_PROC(CmdCopyBuffer, handle);
+
+  ACQUIRE_PROC(GetBufferMemoryRequirements2KHR, handle);
+  ACQUIRE_PROC(GetImageMemoryRequirements2KHR, handle);
+  ACQUIRE_PROC(BindBufferMemory2KHR, handle);
+  ACQUIRE_PROC(BindImageMemory2KHR, handle);
+  ACQUIRE_PROC(GetPhysicalDeviceMemoryProperties2KHR, handle);
+
 #ifndef TEST_VULKAN_PROCS
 #if FML_OS_ANDROID
   ACQUIRE_PROC(AcquireNextImageKHR, handle);

vulkan/procs/vulkan_proc_table.h

@@ -47,8 +47,7 @@ class VulkanProcTable : public fml::RefCountedThreadSafe<VulkanProcTable> {
 
   VulkanProcTable();
   explicit VulkanProcTable(const char* so_path);
-  explicit VulkanProcTable(
-      std::function<void*(VkInstance, const char*)> get_instance_proc_addr);
+  explicit VulkanProcTable(PFN_vkGetInstanceProcAddr get_instance_proc_addr);
   ~VulkanProcTable();
 
   bool HasAcquiredMandatoryProcAddresses() const;
@@ -63,7 +62,7 @@ class VulkanProcTable : public fml::RefCountedThreadSafe<VulkanProcTable> {
 
   bool SetupDeviceProcAddresses(const VulkanHandle<VkDevice>& device);
 
-  std::function<void*(VkInstance, const char*)> GetInstanceProcAddr = nullptr;
+  PFN_vkGetInstanceProcAddr GetInstanceProcAddr = nullptr;
 
 #define DEFINE_PROC(name) Proc<PFN_vk##name> name;
 
@@ -119,6 +118,13 @@ class VulkanProcTable : public fml::RefCountedThreadSafe<VulkanProcTable> {
   DEFINE_PROC(CreateBuffer);
   DEFINE_PROC(DestroyBuffer);
   DEFINE_PROC(CmdCopyBuffer);
+
+  DEFINE_PROC(GetBufferMemoryRequirements2KHR);
+  DEFINE_PROC(GetImageMemoryRequirements2KHR);
+  DEFINE_PROC(BindBufferMemory2KHR);
+  DEFINE_PROC(BindImageMemory2KHR);
+  DEFINE_PROC(GetPhysicalDeviceMemoryProperties2KHR);
+
 #ifndef TEST_VULKAN_PROCS
 #if FML_OS_ANDROID
   DEFINE_PROC(GetPhysicalDeviceSurfaceCapabilitiesKHR);