got the blit to buffer working

Author: gaaclarke

impeller/renderer/backend/vulkan/blit_command_vk.cc

@@ -100,7 +100,7 @@ bool BlitCopyTextureToBufferCommandVK::Encode(CommandEncoderVK& encoder) const {
   // cast source and destination to TextureVK
   const auto& src = TextureVK::Cast(*source);
 
-  if (!encoder.Track(source)) {
+  if (!encoder.Track(source) || !encoder.Track(destination)) {
     return false;
   }
 

impeller/renderer/backend/vulkan/blit_command_vk_unittests.cc

@@ -33,28 +33,28 @@ TEST(BlitCommandVkTest, BlitCopyTextureToTextureCommandVK) {
   EXPECT_TRUE(encoder.IsTracking(cmd.destination));
 }
 
-// TEST(BlitCommandVkTest, BlitCopyTextureToBufferCommandVK) {
-//   ContextVK::Settings settings;
-//   auto message_loop = fml::ConcurrentMessageLoop::Create();
-//   settings.worker_task_runner =
-//       std::make_shared<fml::ConcurrentTaskRunner>(message_loop);
-//   settings.proc_address_callback = GetMockVulkanProcAddress;
-//   auto context = ContextVK::Create(std::move(settings));
-//   auto pool = CommandPoolVK::GetThreadLocal(context.get());
-//   CommandEncoderVK encoder(context->GetDevice(), context->GetGraphicsQueue(),
-//                            pool, context->GetFenceWaiter());
-//   BlitCopyTextureToBufferCommandVK cmd;
-//   cmd.source = context->GetResourceAllocator()->CreateTexture({
-//       .size = ISize(100, 100),
-//   });
-//   cmd.destination = context->GetResourceAllocator()->CreateTexture({
-//       .size = ISize(100, 100),
-//   });
-//   bool result = cmd.Encode(encoder);
-//   EXPECT_TRUE(result);
-//   EXPECT_TRUE(encoder.IsTracking(cmd.source));
-//   EXPECT_TRUE(encoder.IsTracking(cmd.destination));
-// }
+TEST(BlitCommandVkTest, BlitCopyTextureToBufferCommandVK) {
+  ContextVK::Settings settings;
+  auto message_loop = fml::ConcurrentMessageLoop::Create();
+  settings.worker_task_runner =
+      std::make_shared<fml::ConcurrentTaskRunner>(message_loop);
+  settings.proc_address_callback = GetMockVulkanProcAddress;
+  auto context = ContextVK::Create(std::move(settings));
+  auto pool = CommandPoolVK::GetThreadLocal(context.get());
+  CommandEncoderVK encoder(context->GetDevice(), context->GetGraphicsQueue(),
+                           pool, context->GetFenceWaiter());
+  BlitCopyTextureToBufferCommandVK cmd;
+  cmd.source = context->GetResourceAllocator()->CreateTexture({
+      .size = ISize(100, 100),
+  });
+  cmd.destination = context->GetResourceAllocator()->CreateBuffer({
+      .size = 1,
+  });
+  bool result = cmd.Encode(encoder);
+  EXPECT_TRUE(result);
+  EXPECT_TRUE(encoder.IsTracking(cmd.source));
+  EXPECT_TRUE(encoder.IsTracking(cmd.destination));
+}
 
 TEST(BlitCommandVkTest, BlitGenerateMipmapCommandVK) {
   ContextVK::Settings settings;

impeller/renderer/backend/vulkan/command_encoder_vk.cc

@@ -58,6 +58,13 @@ class TrackedObjectsVK {
     tracked_buffers_.insert(std::move(buffer));
   }
 
+  bool IsTracking(const std::shared_ptr<const DeviceBuffer>& buffer) const {
+    if (!buffer) {
+      return false;
+    }
+    return tracked_buffers_.find(buffer) != tracked_buffers_.end();
+  }
+
   void Track(std::shared_ptr<const TextureSourceVK> texture) {
     if (!texture) {
       return;
@@ -179,6 +186,14 @@ bool CommandEncoderVK::Track(std::shared_ptr<const DeviceBuffer> buffer) {
   return true;
 }
 
+bool CommandEncoderVK::IsTracking(
+    const std::shared_ptr<const DeviceBuffer>& buffer) const {
+  if (!IsValid()) {
+    return false;
+  }
+  return tracked_objects_->IsTracking(buffer);
+}
+
 bool CommandEncoderVK::Track(std::shared_ptr<const TextureSourceVK> texture) {
   if (!IsValid()) {
     return false;

impeller/renderer/backend/vulkan/command_encoder_vk.h

@@ -41,8 +41,12 @@ class CommandEncoderVK {
 
   bool Track(std::shared_ptr<const DeviceBuffer> buffer);
 
+  bool IsTracking(const std::shared_ptr<const DeviceBuffer>& texture) const;
+
   bool Track(const std::shared_ptr<const Texture>& texture);
 
+  bool IsTracking(const std::shared_ptr<const Texture>& texture) const;
+
   bool Track(std::shared_ptr<const TextureSourceVK> texture);
 
   vk::CommandBuffer GetCommandBuffer() const;
@@ -56,8 +60,6 @@ class CommandEncoderVK {
   std::optional<vk::DescriptorSet> AllocateDescriptorSet(
       const vk::DescriptorSetLayout& layout);
 
-  bool IsTracking(const std::shared_ptr<const Texture>& texture) const;
-
  private:
   friend class ContextVK;
   friend class ::impeller::testing::

impeller/renderer/backend/vulkan/test/mock_vulkan.cc

@@ -192,6 +192,29 @@ VkResult vkCreateImageView(VkDevice device,
   return VK_SUCCESS;
 }
 
+VkResult vkCreateBuffer(VkDevice device,
+                        const VkBufferCreateInfo* pCreateInfo,
+                        const VkAllocationCallbacks* pAllocator,
+                        VkBuffer* pBuffer) {
+  *pBuffer = reinterpret_cast<VkBuffer>(0xDEADDEAD);
+  return VK_SUCCESS;
+}
+
+void vkGetBufferMemoryRequirements2KHR(
+    VkDevice device,
+    const VkBufferMemoryRequirementsInfo2* pInfo,
+    VkMemoryRequirements2* pMemoryRequirements) {
+  pMemoryRequirements->memoryRequirements.size = 1024;
+  pMemoryRequirements->memoryRequirements.memoryTypeBits = 1;
+}
+
+VkResult vkBindBufferMemory(VkDevice device,
+                            VkBuffer buffer,
+                            VkDeviceMemory memory,
+                            VkDeviceSize memoryOffset) {
+  return VK_SUCCESS;
+}
+
 }  // namespace
 
 PFN_vkVoidFunction GetMockVulkanProcAddress(VkInstance instance,
@@ -239,6 +262,13 @@ PFN_vkVoidFunction GetMockVulkanProcAddress(VkInstance instance,
     return (PFN_vkVoidFunction)vkBindImageMemory;
   } else if (strcmp("vkCreateImageView", pName) == 0) {
     return (PFN_vkVoidFunction)vkCreateImageView;
+  } else if (strcmp("vkCreateBuffer", pName) == 0) {
+    return (PFN_vkVoidFunction)vkCreateBuffer;
+  } else if (strcmp("vkGetBufferMemoryRequirements2KHR", pName) == 0 ||
+             strcmp("vkGetBufferMemoryRequirements2", pName) == 0) {
+    return (PFN_vkVoidFunction)vkGetBufferMemoryRequirements2KHR;
+  } else if (strcmp("vkBindBufferMemory", pName) == 0) {
+    return (PFN_vkVoidFunction)vkBindBufferMemory;
   }
   return noop;
 }