redid the tests

gaaclarke · gaaclarke · commit 51c862571290 · 2023-06-13T11:17:37.000-07:00
diff --git a/impeller/renderer/backend/vulkan/BUILD.gn b/impeller/renderer/backend/vulkan/BUILD.gn
@@ -52,6 +52,7 @@ impeller_component("vulkan") {
     "fence_waiter_vk.h",
     "formats_vk.cc",
     "formats_vk.h",
+    "pass_bindings_cache.cc",
     "pass_bindings_cache.h",
     "pipeline_cache_vk.cc",
     "pipeline_cache_vk.h",
diff --git a/impeller/renderer/backend/vulkan/command_encoder_vk.h b/impeller/renderer/backend/vulkan/command_encoder_vk.h
@@ -18,13 +18,6 @@
 
 namespace impeller {
 
-namespace testing {
-class BlitCommandVkTest_BlitCopyTextureToTextureCommandVK_Test;
-class BlitCommandVkTest_BlitCopyTextureToBufferCommandVK_Test;
-class BlitCommandVkTest_BlitCopyBufferToTextureCommandVK_Test;
-class BlitCommandVkTest_BlitGenerateMipmapCommandVK_Test;
-}  // namespace testing
-
 class ContextVK;
 class DeviceBuffer;
 class Buffer;
@@ -37,6 +30,12 @@ class CommandEncoderVK {
  public:
   using SubmitCallback = std::function<void(bool)>;
 
+  // Visible for testing.
+  CommandEncoderVK(const std::weak_ptr<const DeviceHolder>& device_holder,
+                   const std::shared_ptr<QueueVK>& queue,
+                   const std::shared_ptr<CommandPoolVK>& pool,
+                   std::shared_ptr<FenceWaiterVK> fence_waiter);
+
   ~CommandEncoderVK();
 
   bool IsValid() const;
@@ -68,26 +67,13 @@ class CommandEncoderVK {
 
  private:
   friend class ContextVK;
-  friend class ::impeller::testing::
-      BlitCommandVkTest_BlitCopyTextureToTextureCommandVK_Test;
-  friend class ::impeller::testing::
-      BlitCommandVkTest_BlitCopyTextureToBufferCommandVK_Test;
-  friend class ::impeller::testing::
-      BlitCommandVkTest_BlitGenerateMipmapCommandVK_Test;
-  friend class ::impeller::testing::
-      BlitCommandVkTest_BlitCopyBufferToTextureCommandVK_Test;
 
   std::weak_ptr<const DeviceHolder> device_holder_;
   std::shared_ptr<QueueVK> queue_;
   std::shared_ptr<FenceWaiterVK> fence_waiter_;
   std::shared_ptr<TrackedObjectsVK> tracked_objects_;
   bool is_valid_ = false;
 
-  CommandEncoderVK(const std::weak_ptr<const DeviceHolder>& device_holder,
-                   const std::shared_ptr<QueueVK>& queue,
-                   const std::shared_ptr<CommandPoolVK>& pool,
-                   std::shared_ptr<FenceWaiterVK> fence_waiter);
-
   void Reset();
 
   FML_DISALLOW_COPY_AND_ASSIGN(CommandEncoderVK);
diff --git a/impeller/renderer/backend/vulkan/pass_bindings_cache.cc b/impeller/renderer/backend/vulkan/pass_bindings_cache.cc
@@ -0,0 +1,72 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/vulkan/pass_bindings_cache.h"
+
+namespace impeller {
+void PassBindingsCache::bindPipeline(vk::CommandBuffer command_buffer,
+                                     vk::PipelineBindPoint pipeline_bind_point,
+                                     vk::Pipeline pipeline) {
+  switch (pipeline_bind_point) {
+    case vk::PipelineBindPoint::eGraphics:
+      if (graphics_pipeline_.has_value() &&
+          graphics_pipeline_.value() == pipeline) {
+        return;
+      }
+      graphics_pipeline_ = pipeline;
+      break;
+    case vk::PipelineBindPoint::eCompute:
+      if (compute_pipeline_.has_value() &&
+          compute_pipeline_.value() == pipeline) {
+        return;
+      }
+      compute_pipeline_ = pipeline;
+      break;
+    default:
+      break;
+  }
+  command_buffer.bindPipeline(pipeline_bind_point, pipeline);
+}
+
+void PassBindingsCache::setStencilReference(vk::CommandBuffer command_buffer,
+                                            vk::StencilFaceFlags face_mask,
+                                            uint32_t reference) {
+  if (stencil_face_flags_.has_value() &&
+      face_mask == stencil_face_flags_.value() &&
+      reference == stencil_reference_) {
+    return;
+  }
+  stencil_face_flags_ = face_mask;
+  stencil_reference_ = reference;
+  command_buffer.setStencilReference(face_mask, reference);
+}
+
+void PassBindingsCache::setScissor(vk::CommandBuffer command_buffer,
+                                   uint32_t first_scissor,
+                                   uint32_t scissor_count,
+                                   const vk::Rect2D* scissors) {
+  if (first_scissor == 0 && scissor_count == 1) {
+    if (scissors_.has_value() && scissors_.value() == scissors[0]) {
+      return;
+    }
+    scissors_ = scissors[0];
+  }
+  command_buffer.setScissor(first_scissor, scissor_count, scissors);
+}
+
+void PassBindingsCache::setViewport(vk::CommandBuffer command_buffer,
+                                    uint32_t first_viewport,
+                                    uint32_t viewport_count,
+                                    const vk::Viewport* viewports) {
+  if (first_viewport == 0 && viewport_count == 1) {
+    // Note that this is doing equality checks on floating point numbers.
+    if (viewport_.has_value() && viewport_.value() == viewports[0]) {
+      return;
+    }
+    viewport_ = viewports[0];
+  }
+  command_buffer.setViewport(first_viewport, viewport_count, viewports);
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/pass_bindings_cache.h b/impeller/renderer/backend/vulkan/pass_bindings_cache.h
@@ -10,72 +10,25 @@
 
 namespace impeller {
 
-template <typename CommandBuffer>
 class PassBindingsCache {
  public:
-  void bindPipeline(CommandBuffer command_buffer,
+  void bindPipeline(vk::CommandBuffer command_buffer,
                     vk::PipelineBindPoint pipeline_bind_point,
-                    vk::Pipeline pipeline) {
-    switch (pipeline_bind_point) {
-      case vk::PipelineBindPoint::eGraphics:
-        if (graphics_pipeline_.has_value() &&
-            graphics_pipeline_.value() == pipeline) {
-          return;
-        }
-        graphics_pipeline_ = pipeline;
-        break;
-      case vk::PipelineBindPoint::eCompute:
-        if (compute_pipeline_.has_value() &&
-            compute_pipeline_.value() == pipeline) {
-          return;
-        }
-        compute_pipeline_ = pipeline;
-        break;
-      default:
-        break;
-    }
-    command_buffer.bindPipeline(pipeline_bind_point, pipeline);
-  }
+                    vk::Pipeline pipeline);
 
-  void setStencilReference(CommandBuffer command_buffer,
+  void setStencilReference(vk::CommandBuffer command_buffer,
                            vk::StencilFaceFlags face_mask,
-                           uint32_t reference) {
-    if (stencil_face_flags_.has_value() &&
-        face_mask == stencil_face_flags_.value() &&
-        reference == stencil_reference_) {
-      return;
-    }
-    stencil_face_flags_ = face_mask;
-    stencil_reference_ = reference;
-    command_buffer.setStencilReference(face_mask, reference);
-  }
+                           uint32_t reference);
 
-  void setScissor(CommandBuffer command_buffer,
+  void setScissor(vk::CommandBuffer command_buffer,
                   uint32_t first_scissor,
                   uint32_t scissor_count,
-                  const vk::Rect2D* scissors) {
-    if (first_scissor == 0 && scissor_count == 1) {
-      if (scissors_.has_value() && scissors_.value() == scissors[0]) {
-        return;
-      }
-      scissors_ = scissors[0];
-    }
-    command_buffer.setScissor(first_scissor, scissor_count, scissors);
-  }
+                  const vk::Rect2D* scissors);
 
-  void setViewport(CommandBuffer command_buffer,
+  void setViewport(vk::CommandBuffer command_buffer,
                    uint32_t first_viewport,
                    uint32_t viewport_count,
-                   const vk::Viewport* viewports) {
-    if (first_viewport == 0 && viewport_count == 1) {
-      // Note that this is doing equality checks on floating point numbers.
-      if (viewport_.has_value() && viewport_.value() == viewports[0]) {
-        return;
-      }
-      viewport_ = viewports[0];
-    }
-    command_buffer.setViewport(first_viewport, viewport_count, viewports);
-  }
+                   const vk::Viewport* viewports);
 
  private:
   // bindPipeline
diff --git a/impeller/renderer/backend/vulkan/pass_bindings_cache_unittests.cc b/impeller/renderer/backend/vulkan/pass_bindings_cache_unittests.cc
@@ -3,92 +3,91 @@
 // found in the LICENSE file.
 
 #include "flutter/testing/testing.h"
+#include "impeller/renderer/backend/vulkan/command_encoder_vk.h"
 #include "impeller/renderer/backend/vulkan/pass_bindings_cache.h"
+#include "impeller/renderer/backend/vulkan/test/mock_vulkan.h"
 
 namespace impeller {
 namespace testing {
 
 namespace {
-struct Tallies {
-  int32_t bindPipeline_count = 0;
-  int32_t setStencilReference_count = 0;
-  int32_t setScissor_count = 0;
-  int32_t setViewport_count = 0;
-};
-
-class MockCommandBuffer {
- public:
-  MockCommandBuffer() : tallies_(new Tallies()) {}
-
-  void bindPipeline(vk::PipelineBindPoint pipeline_bind_point,
-                    vk::Pipeline pipeline) {
-    tallies_->bindPipeline_count += 1;
-  }
-
-  void setStencilReference(vk::StencilFaceFlags face_mask, uint32_t reference) {
-    tallies_->setStencilReference_count += 1;
-  }
-
-  void setScissor(uint32_t first_scissor,
-                  uint32_t scissor_count,
-                  const vk::Rect2D* scissors) {
-    tallies_->setScissor_count += 1;
-  }
-
-  void setViewport(uint32_t first_viewport,
-                   uint32_t viewport_count,
-                   const vk::Viewport* viewports) {
-    tallies_->setViewport_count += 1;
+int32_t CountStringViewInstances(const std::vector<std::string>& strings,
+                                 std::string_view target) {
+  int32_t count = 0;
+  for (const std::string& str : strings) {
+    if (str == target) {
+      count++;
+    }
   }
-
-  std::shared_ptr<Tallies> tallies_;
-};
+  return count;
+}
 }  // namespace
 
 TEST(PassBindingsCacheTest, bindPipeline) {
-  PassBindingsCache<MockCommandBuffer> cache;
-  MockCommandBuffer buffer;
+  auto context = CreateMockVulkanContext();
+  PassBindingsCache cache;
+  auto pool = CommandPoolVK::GetThreadLocal(context.get());
+  CommandEncoderVK encoder(context->GetDeviceHolder(),
+                           context->GetGraphicsQueue(), pool,
+                           context->GetFenceWaiter());
+  auto buffer = encoder.GetCommandBuffer();
   VkPipeline vk_pipeline = reinterpret_cast<VkPipeline>(0xfeedface);
   vk::Pipeline pipeline(vk_pipeline);
-  ASSERT_EQ(buffer.tallies_->bindPipeline_count, 0);
   cache.bindPipeline(buffer, vk::PipelineBindPoint::eGraphics, pipeline);
-  ASSERT_EQ(buffer.tallies_->bindPipeline_count, 1);
   cache.bindPipeline(buffer, vk::PipelineBindPoint::eGraphics, pipeline);
-  ASSERT_EQ(buffer.tallies_->bindPipeline_count, 1);
+  std::shared_ptr<std::vector<std::string>> functions =
+      GetMockVulkanFunctions(context->GetDevice());
+  EXPECT_EQ(CountStringViewInstances(*functions, "vkCmdBindPipeline"), 1);
 }
 
 TEST(PassBindingsCacheTest, setStencilReference) {
-  PassBindingsCache<MockCommandBuffer> cache;
-  MockCommandBuffer buffer;
-  ASSERT_EQ(buffer.tallies_->setStencilReference_count, 0);
+  auto context = CreateMockVulkanContext();
+  PassBindingsCache cache;
+  auto pool = CommandPoolVK::GetThreadLocal(context.get());
+  CommandEncoderVK encoder(context->GetDeviceHolder(),
+                           context->GetGraphicsQueue(), pool,
+                           context->GetFenceWaiter());
+  auto buffer = encoder.GetCommandBuffer();
   cache.setStencilReference(
       buffer, vk::StencilFaceFlagBits::eVkStencilFrontAndBack, 123);
-  ASSERT_EQ(buffer.tallies_->setStencilReference_count, 1);
   cache.setStencilReference(
       buffer, vk::StencilFaceFlagBits::eVkStencilFrontAndBack, 123);
-  ASSERT_EQ(buffer.tallies_->setStencilReference_count, 1);
+  std::shared_ptr<std::vector<std::string>> functions =
+      GetMockVulkanFunctions(context->GetDevice());
+  EXPECT_EQ(CountStringViewInstances(*functions, "vkCmdSetStencilReference"),
+            1);
 }
 
 TEST(PassBindingsCacheTest, setScissor) {
-  PassBindingsCache<MockCommandBuffer> cache;
-  MockCommandBuffer buffer;
+  auto context = CreateMockVulkanContext();
+  PassBindingsCache cache;
+  auto pool = CommandPoolVK::GetThreadLocal(context.get());
+  CommandEncoderVK encoder(context->GetDeviceHolder(),
+                           context->GetGraphicsQueue(), pool,
+                           context->GetFenceWaiter());
+  auto buffer = encoder.GetCommandBuffer();
   vk::Rect2D scissors;
-  ASSERT_EQ(buffer.tallies_->setScissor_count, 0);
   cache.setScissor(buffer, 0, 1, &scissors);
-  ASSERT_EQ(buffer.tallies_->setScissor_count, 1);
   cache.setScissor(buffer, 0, 1, &scissors);
-  ASSERT_EQ(buffer.tallies_->setScissor_count, 1);
+  std::shared_ptr<std::vector<std::string>> functions =
+      GetMockVulkanFunctions(context->GetDevice());
+  EXPECT_EQ(CountStringViewInstances(*functions, "vkCmdSetScissor"), 1);
 }
 
 TEST(PassBindingsCacheTest, setViewport) {
-  PassBindingsCache<MockCommandBuffer> cache;
-  MockCommandBuffer buffer;
+  auto context = CreateMockVulkanContext();
+  PassBindingsCache cache;
+  auto pool = CommandPoolVK::GetThreadLocal(context.get());
+  CommandEncoderVK encoder(context->GetDeviceHolder(),
+                           context->GetGraphicsQueue(), pool,
+                           context->GetFenceWaiter());
+  auto buffer = encoder.GetCommandBuffer();
   vk::Viewport viewports;
-  ASSERT_EQ(buffer.tallies_->setViewport_count, 0);
   cache.setViewport(buffer, 0, 1, &viewports);
-  ASSERT_EQ(buffer.tallies_->setViewport_count, 1);
   cache.setViewport(buffer, 0, 1, &viewports);
-  ASSERT_EQ(buffer.tallies_->setViewport_count, 1);
+  std::shared_ptr<std::vector<std::string>> functions =
+      GetMockVulkanFunctions(context->GetDevice());
+  EXPECT_EQ(CountStringViewInstances(*functions, "vkCmdSetViewport"), 1);
 }
 
 }  // namespace testing
diff --git a/impeller/renderer/backend/vulkan/render_pass_vk.cc b/impeller/renderer/backend/vulkan/render_pass_vk.cc
@@ -415,11 +415,10 @@ static bool AllocateAndBindDescriptorSets(const ContextVK& context,
   return true;
 }
 
-static void SetViewportAndScissor(
-    const Command& command,
-    const vk::CommandBuffer& cmd_buffer,
-    PassBindingsCache<vk::CommandBuffer>& cmd_buffer_cache,
-    const ISize& target_size) {
+static void SetViewportAndScissor(const Command& command,
+                                  const vk::CommandBuffer& cmd_buffer,
+                                  PassBindingsCache& cmd_buffer_cache,
+                                  const ISize& target_size) {
   // Set the viewport.
   const auto& vp = command.viewport.value_or<Viewport>(
       {.rect = Rect::MakeSize(target_size)});
@@ -440,12 +439,11 @@ static void SetViewportAndScissor(
   cmd_buffer_cache.setScissor(cmd_buffer, 0, 1, &scissor);
 }
 
-static bool EncodeCommand(
-    const Context& context,
-    const Command& command,
-    CommandEncoderVK& encoder,
-    PassBindingsCache<vk::CommandBuffer>& command_buffer_cache,
-    const ISize& target_size) {
+static bool EncodeCommand(const Context& context,
+                          const Command& command,
+                          CommandEncoderVK& encoder,
+                          PassBindingsCache& command_buffer_cache,
+                          const ISize& target_size) {
   if (command.vertex_count == 0u || command.instance_count == 0u) {
     return true;
   }
diff --git a/impeller/renderer/backend/vulkan/render_pass_vk.h b/impeller/renderer/backend/vulkan/render_pass_vk.h
diff --git a/impeller/renderer/backend/vulkan/test/mock_vulkan.cc b/impeller/renderer/backend/vulkan/test/mock_vulkan.cc
