Merge branch 'main' into bdero/gaussian-blur-alphamask

Author: bdero

DEPS

@@ -48,7 +48,7 @@ vars = {
   # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': '2bb9c265fa24f1ba98239b23b15ecf5bfb2dbb22',
+  'dart_revision': '8481b8f08044eeb94d60d4d5dfc3c26801d43f2c',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -386,7 +386,7 @@ deps = {
    Var('dart_git') + '/json_rpc_2.git@0280ac6cb4f3905d81c47ba927123ba2b95f7940',
 
   'src/third_party/dart/third_party/pkg/linter':
-   Var('dart_git') + '/linter.git@7c7db85d29b46af51e3f4a5e0a33440c4e3791fc',
+   Var('dart_git') + '/linter.git@d116555dc05bd29a17842e36e684cb9b4a608e1e',
 
   'src/third_party/dart/third_party/pkg/logging':
    Var('dart_git') + '/logging.git@abef3717d958158eb8b0ddb2871f4b15a9804cd4',
@@ -455,7 +455,7 @@ deps = {
    Var('dart_git') + '/test_reflective_loader.git@c4c2d5c3f94a96f3fc79e9e28944fba391bc544c',
 
   'src/third_party/dart/third_party/pkg/tools':
-   Var('dart_git') + '/tools.git@8d18d01192077e85839539de9afdf679622445c8',
+   Var('dart_git') + '/tools.git@9ce9f67c3ff2ac835ed0045e71d22188e2a19562',
 
   'src/third_party/dart/third_party/pkg/typed_data':
    Var('dart_git') + '/typed_data.git@f858046fb420cf644e7d8cb86b7893f2830d8a6c',

impeller/aiks/aiks_unittests.cc

@@ -1823,10 +1823,6 @@ TEST_P(AiksTest, SiblingSaveLayerBoundsAreRespected) {
 }
 
 TEST_P(AiksTest, CanRenderClippedLayers) {
-  if (GetBackend() == PlaygroundBackend::kVulkan) {
-    GTEST_SKIP_("Temporarily disabled.");
-  }
-
   Canvas canvas;
 
   canvas.DrawPaint({.color = Color::White()});
@@ -1877,9 +1873,6 @@ TEST_P(AiksTest, SaveLayerFiltersScaleWithTransform) {
 }
 
 TEST_P(AiksTest, SceneColorSource) {
-  if (GetBackend() == PlaygroundBackend::kVulkan) {
-    GTEST_SKIP_("Temporarily disabled.");
-  }
   // Load up the scene.
   auto mapping =
       flutter::testing::OpenFixtureAsMapping("flutter_logo_baked.glb.ipscene");

impeller/display_list/display_list_unittests.cc

@@ -679,10 +679,6 @@ TEST_P(DisplayListTest, SaveLayerWithBlendFiltersAndAlphaDrawCorrectly) {
 }
 
 TEST_P(DisplayListTest, CanDrawBackdropFilter) {
-  if (GetBackend() == PlaygroundBackend::kVulkan) {
-    GTEST_SKIP_("Temporarily disabled.");
-  }
-
   auto texture = CreateTextureForFixture("embarcadero.jpg");
 
   auto callback = [&]() {

impeller/entity/entity_pass_target.cc

@@ -4,6 +4,8 @@
 
 #include "impeller/entity/entity_pass_target.h"
 
+#include "impeller/base/validation.h"
+#include "impeller/renderer/formats.h"
 #include "impeller/renderer/texture.h"
 
 namespace impeller {
@@ -15,8 +17,16 @@ EntityPassTarget::EntityPassTarget(const RenderTarget& render_target,
 
 std::shared_ptr<Texture> EntityPassTarget::Flip(Allocator& allocator) {
   auto color0 = target_.GetColorAttachments().find(0)->second;
+  if (!color0.resolve_texture) {
+    VALIDATION_LOG << "EntityPassTarget Flip should never be called for a "
+                      "non-MSAA target.";
+    // ...because there is never a circumstance where doing so would be
+    // necessary. Unlike MSAA passes, non-MSAA passes can be trivially loaded
+    // with `LoadAction::kLoad`.
+    return color0.texture;
+  }
 
-  if (supports_read_from_resolve_ && color0.resolve_texture) {
+  if (supports_read_from_resolve_) {
     // Just return the current resolve texture, which is safe to read in the
     // next render pass that'll resolve to `target_`.
     //
@@ -26,16 +36,16 @@ std::shared_ptr<Texture> EntityPassTarget::Flip(Allocator& allocator) {
 
   if (!secondary_color_texture_) {
     // The second texture is allocated lazily to avoid unused allocations.
-    TextureDescriptor new_descriptor = color0.texture->GetTextureDescriptor();
+    TextureDescriptor new_descriptor =
+        color0.resolve_texture->GetTextureDescriptor();
     secondary_color_texture_ = allocator.CreateTexture(new_descriptor);
 
     if (!secondary_color_texture_) {
       return nullptr;
     }
   }
 
-  std::swap(color0.resolve_texture ? color0.resolve_texture : color0.texture,
-            secondary_color_texture_);
+  std::swap(color0.resolve_texture, secondary_color_texture_);
 
   target_.SetColorAttachment(color0, 0);
 

impeller/renderer/backend/vulkan/allocator_vk.cc

@@ -311,37 +311,6 @@ class AllocatedTextureSourceVK final : public TextureSourceVK {
     }
   }
 
-  bool SetContents(const TextureDescriptor& desc,
-                   const uint8_t* contents,
-                   size_t length,
-                   size_t slice) override {
-    void* data = nullptr;
-    if (::vmaMapMemory(allocator_, allocation_, &data) != VK_SUCCESS) {
-      VALIDATION_LOG << "Could not map texture memory to write to.";
-      return false;
-    }
-
-    std::memcpy(static_cast<uint8_t*>(data) + (length * slice),  //
-                contents,                                        //
-                length                                           //
-    );
-
-    const auto flushed = ::vmaFlushAllocation(allocator_,      // allocator
-                                              allocation_,     // allocation
-                                              length * slice,  // offset
-                                              length           // size
-                                              ) == VK_SUCCESS;
-
-    ::vmaUnmapMemory(allocator_, allocation_);
-
-    if (!flushed) {
-      VALIDATION_LOG << "Could not flush written mapped memory.";
-      return false;
-    }
-
-    return true;
-  }
-
   bool IsValid() const { return is_valid_; }
 
   vk::Image GetImage() const override { return image_; }

impeller/renderer/backend/vulkan/context_vk.cc

@@ -397,6 +397,7 @@ vk::Device ContextVK::GetDevice() const {
 }
 
 std::unique_ptr<Surface> ContextVK::AcquireNextSurface() {
+  TRACE_EVENT0("impeller", __FUNCTION__);
   auto surface = swapchain_ ? swapchain_->AcquireNextDrawable() : nullptr;
   if (surface && pipeline_library_) {
     pipeline_library_->DidAcquireSurfaceFrame();

impeller/renderer/backend/vulkan/swapchain_impl_vk.cc

@@ -29,7 +29,7 @@ struct FrameSynchronizer {
     if (acquire_res.result != vk::Result::eSuccess ||
         render_res.result != vk::Result::eSuccess ||
         present_res.result != vk::Result::eSuccess) {
-      VALIDATION_LOG << "Could not create synchornizer.";
+      VALIDATION_LOG << "Could not create synchronizer.";
       return;
     }
     acquire = std::move(acquire_res.value);
@@ -41,14 +41,18 @@ struct FrameSynchronizer {
   ~FrameSynchronizer() = default;
 
   bool WaitForFence(const vk::Device& device) {
-    if (device.waitForFences(
+    if (auto result = device.waitForFences(
             *acquire,                             // fence
             true,                                 // wait all
             std::numeric_limits<uint64_t>::max()  // timeout (ns)
-            ) != vk::Result::eSuccess) {
+        );
+        result != vk::Result::eSuccess) {
+      VALIDATION_LOG << "Fence wait failed: " << vk::to_string(result);
       return false;
     }
-    if (device.resetFences(*acquire) != vk::Result::eSuccess) {
+    if (auto result = device.resetFences(*acquire);
+        result != vk::Result::eSuccess) {
+      VALIDATION_LOG << "Could not reset fence: " << vk::to_string(result);
       return false;
     }
     return true;

impeller/renderer/backend/vulkan/texture_source_vk.cc

@@ -58,11 +58,4 @@ bool TextureSourceVK::SetLayout(const LayoutTransition& transition) const {
   return true;
 }
 
-bool TextureSourceVK::SetContents(const TextureDescriptor& desc,
-                                  const uint8_t* contents,
-                                  size_t length,
-                                  size_t slice) {
-  return false;
-}
-
 }  // namespace impeller

impeller/renderer/backend/vulkan/texture_source_vk.h

@@ -18,11 +18,6 @@ class TextureSourceVK {
 
   const TextureDescriptor& GetTextureDescriptor() const;
 
-  virtual bool SetContents(const TextureDescriptor& desc,
-                           const uint8_t* contents,
-                           size_t length,
-                           size_t slice);
-
   virtual vk::Image GetImage() const = 0;
 
   virtual vk::ImageView GetImageView() const = 0;

impeller/renderer/renderer_unittests.cc

@@ -278,9 +278,6 @@ TEST_P(RendererTest, CanRenderMultiplePrimitives) {
 }
 
 TEST_P(RendererTest, CanRenderToTexture) {
-  if (GetBackend() == PlaygroundBackend::kVulkan) {
-    GTEST_SKIP_("Temporarily disabled.");
-  }
   using VS = BoxFadeVertexShader;
   using FS = BoxFadeFragmentShader;
   auto context = GetContext();
@@ -312,9 +309,9 @@ TEST_P(RendererTest, CanRenderToTexture) {
   ASSERT_TRUE(bridge && boston);
   auto sampler = context->GetSamplerLibrary()->GetSampler({});
   ASSERT_TRUE(sampler);
-
   std::shared_ptr<RenderPass> r2t_pass;
-
+  auto cmd_buffer = context->CreateCommandBuffer();
+  ASSERT_TRUE(cmd_buffer);
   {
     ColorAttachment color0;
     color0.load_action = LoadAction::kClear;
@@ -352,7 +349,6 @@ TEST_P(RendererTest, CanRenderToTexture) {
     RenderTarget r2t_desc;
     r2t_desc.SetColorAttachment(color0, 0u);
     r2t_desc.SetStencilAttachment(stencil0);
-    auto cmd_buffer = context->CreateCommandBuffer();
     r2t_pass = cmd_buffer->CreateRenderPass(r2t_desc);
     ASSERT_TRUE(r2t_pass && r2t_pass->IsValid());
   }