Merge branch 'main' into fix_barriers_vulkan

Author: jonahwilliams

.ci.yaml

@@ -115,6 +115,7 @@ targets:
     timeout: 60
 
   - name: Mac builder_cache
+    bringup: true
     enabled_branches:
       - main
     recipe: engine_v2/cache
@@ -129,7 +130,8 @@ targets:
         ]
       ignore_cache_paths: >-
         [
-          "builder/src/flutter/prebuilts/SDKs"
+          "builder/src/flutter/prebuilts/SDKs",
+          "builder/src/flutter/prebuilts/Library"
         ]
       gclient_variables: >-
         {

DEPS

@@ -65,7 +65,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': '9470ea6b00a588cbd19713919979954403f1465a',
+  'dart_revision': '5646ac9669f8b8b15651979875f9a8b8e6acc857',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -270,7 +270,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'a43582b52d361bc3da156a8e6eab6dd947ca339d',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'a2dfdefd9b1248689264bfe8b48e1c83b5e80039',
 
   'src/flutter/third_party/rapidjson':
    Var('flutter_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b',

ci/licenses_golden/licenses_dart

@@ -1,4 +1,4 @@
-Signature: b94327adc1096bd6bc6080a3345c0946
+Signature: 070d855e9daf0706a6209be7505b27e1
 
 ====================================================================================================
 LIBRARY: dart
@@ -4707,7 +4707,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
   This Source Code Form is "Incompatible With Secondary Licenses", as
   defined by the Mozilla Public License, v. 2.0.
 
-You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/9470ea6b00a588cbd19713919979954403f1465a
+You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/5646ac9669f8b8b15651979875f9a8b8e6acc857
 /third_party/fallback_root_certificates/
 
 ====================================================================================================

impeller/entity/contents/content_context.cc

@@ -142,12 +142,26 @@ void ContentContextOptions::ApplyToPipelineDescriptor(
   }
 
   auto maybe_stencil = desc.GetFrontStencilAttachmentDescriptor();
+  auto maybe_depth = desc.GetDepthStencilAttachmentDescriptor();
+  FML_DCHECK(has_depth_stencil_attachments == maybe_depth.has_value())
+      << "Depth attachment doesn't match expected pipeline state. "
+         "has_depth_stencil_attachments="
+      << has_depth_stencil_attachments;
+  FML_DCHECK(has_depth_stencil_attachments == maybe_stencil.has_value())
+      << "Stencil attachment doesn't match expected pipeline state. "
+         "has_depth_stencil_attachments="
+      << has_depth_stencil_attachments;
   if (maybe_stencil.has_value()) {
     StencilAttachmentDescriptor stencil = maybe_stencil.value();
     stencil.stencil_compare = stencil_compare;
     stencil.depth_stencil_pass = stencil_operation;
     desc.SetStencilAttachmentDescriptors(stencil);
   }
+  if (maybe_depth.has_value()) {
+    DepthAttachmentDescriptor depth = maybe_depth.value();
+    depth.depth_compare = CompareFunction::kAlways;
+    depth.depth_write_enabled = false;
+  }
 
   desc.SetPrimitiveType(primitive_type);
 

impeller/entity/contents/runtime_effect_contents.cc

@@ -141,7 +141,7 @@ bool RuntimeEffectContents::Render(const ContentContext& renderer,
 
   const std::shared_ptr<const Capabilities>& caps = context->GetCapabilities();
   const auto color_attachment_format = caps->GetDefaultColorFormat();
-  const auto stencil_attachment_format = caps->GetDefaultStencilFormat();
+  const auto stencil_attachment_format = caps->GetDefaultDepthStencilFormat();
 
   using VS = RuntimeEffectVertexShader;
 
@@ -303,11 +303,12 @@ bool RuntimeEffectContents::Render(const ContentContext& renderer,
     desc.SetColorAttachmentDescriptor(
         0u, {.format = color_attachment_format, .blending_enabled = true});
 
-    StencilAttachmentDescriptor stencil0;
-    stencil0.stencil_compare = CompareFunction::kEqual;
-    desc.SetStencilAttachmentDescriptors(stencil0);
+    desc.SetStencilAttachmentDescriptors(StencilAttachmentDescriptor{});
     desc.SetStencilPixelFormat(stencil_attachment_format);
 
+    desc.SetDepthStencilAttachmentDescriptor(DepthAttachmentDescriptor{});
+    desc.SetDepthPixelFormat(stencil_attachment_format);
+
     options.ApplyToPipelineDescriptor(desc);
     auto pipeline = context->GetPipelineLibrary()->GetPipeline(desc).Get();
     if (!pipeline) {

impeller/entity/entity_pass.cc

@@ -328,6 +328,12 @@ bool EntityPass::Render(ContentContext& renderer,
     VALIDATION_LOG << "The root RenderTarget must have a color attachment.";
     return false;
   }
+  if (root_render_target.GetDepthAttachment().has_value() !=
+      root_render_target.GetStencilAttachment().has_value()) {
+    VALIDATION_LOG << "The root RenderTarget should have a stencil attachment "
+                      "iff it has a depth attachment.";
+    return false;
+  }
 
   capture.AddRect("Coverage",
                   Rect::MakeSize(root_render_target.GetRenderTargetSize()),

impeller/entity/entity_unittests.cc

@@ -2200,6 +2200,53 @@ TEST_P(EntityTest, RuntimeEffect) {
   ASSERT_TRUE(OpenPlaygroundHere(callback));
 }
 
+TEST_P(EntityTest, RuntimeEffectCanSuccessfullyRender) {
+  auto runtime_stages =
+      OpenAssetAsRuntimeStage("runtime_stage_example.frag.iplr");
+  auto runtime_stage =
+      runtime_stages[PlaygroundBackendToRuntimeStageBackend(GetBackend())];
+  ASSERT_TRUE(runtime_stage);
+  ASSERT_TRUE(runtime_stage->IsDirty());
+
+  auto contents = std::make_shared<RuntimeEffectContents>();
+  contents->SetGeometry(Geometry::MakeCover());
+
+  contents->SetRuntimeStage(runtime_stage);
+
+  struct FragUniforms {
+    Vector2 iResolution;
+    Scalar iTime;
+  } frag_uniforms = {
+      .iResolution = Vector2(GetWindowSize().width, GetWindowSize().height),
+      .iTime = static_cast<Scalar>(GetSecondsElapsed()),
+  };
+  auto uniform_data = std::make_shared<std::vector<uint8_t>>();
+  uniform_data->resize(sizeof(FragUniforms));
+  memcpy(uniform_data->data(), &frag_uniforms, sizeof(FragUniforms));
+  contents->SetUniformData(uniform_data);
+
+  Entity entity;
+  entity.SetContents(contents);
+
+  // Create a render target with a depth-stencil, similar to how EntityPass
+  // does.
+  RenderTarget target = RenderTarget::CreateOffscreenMSAA(
+      *GetContext(), *GetContentContext()->GetRenderTargetCache(),
+      {GetWindowSize().width, GetWindowSize().height}, 1,
+      "RuntimeEffect Texture");
+  testing::MockRenderPass pass(GetContext(), target);
+
+  ASSERT_TRUE(contents->Render(*GetContentContext(), entity, pass));
+  ASSERT_EQ(pass.GetCommands().size(), 1u);
+  const auto& command = pass.GetCommands()[0];
+  ASSERT_TRUE(command.pipeline->GetDescriptor()
+                  .GetDepthStencilAttachmentDescriptor()
+                  .has_value());
+  ASSERT_TRUE(command.pipeline->GetDescriptor()
+                  .GetFrontStencilAttachmentDescriptor()
+                  .has_value());
+}
+
 TEST_P(EntityTest, RuntimeEffectSetsRightSizeWhenUniformIsStruct) {
   if (GetBackend() != PlaygroundBackend::kVulkan) {
     GTEST_SKIP() << "Test only applies to Vulkan";

impeller/golden_tests/golden_playground_test_mac.cc

@@ -60,6 +60,12 @@ static const std::vector<std::string> kSkipTests = {
     "impeller_Play_AiksTest_CaptureContext_Vulkan",
 };
 
+/// TODO(https://github.com/flutter/flutter/issues/142017): Turn on validation
+/// for all vulkan tests.
+static const std::vector<std::string> kVulkanValidationTests = {
+    "impeller_Play_AiksTest_CanRenderTextFrame_Vulkan",
+};
+
 namespace {
 std::string GetTestName() {
   std::string suite_name =
@@ -127,13 +133,20 @@ void GoldenPlaygroundTest::SetUp() {
     return;
   }
 
+  bool enable_vulkan_validations = false;
+  std::string test_name = GetTestName();
+  if (std::find(kVulkanValidationTests.begin(), kVulkanValidationTests.end(),
+                test_name) != kVulkanValidationTests.end()) {
+    enable_vulkan_validations = true;
+  }
+
   if (GetParam() == PlaygroundBackend::kMetal) {
     pimpl_->screenshotter = std::make_unique<testing::MetalScreenshotter>();
   } else if (GetParam() == PlaygroundBackend::kVulkan) {
-    pimpl_->screenshotter = std::make_unique<testing::VulkanScreenshotter>();
+    pimpl_->screenshotter = std::make_unique<testing::VulkanScreenshotter>(
+        enable_vulkan_validations);
   }
 
-  std::string test_name = GetTestName();
   if (std::find(kSkipTests.begin(), kSkipTests.end(), test_name) !=
       kSkipTests.end()) {
     GTEST_SKIP_(

impeller/golden_tests/vulkan_screenshotter.h

@@ -18,7 +18,7 @@ namespace testing {
 /// playground backend.
 class VulkanScreenshotter : public Screenshotter {
  public:
-  VulkanScreenshotter();
+  explicit VulkanScreenshotter(bool enable_validations);
 
   std::unique_ptr<Screenshot> MakeScreenshot(
       AiksContext& aiks_context,

impeller/golden_tests/vulkan_screenshotter.mm

@@ -64,10 +64,12 @@
 }
 }  // namespace
 
-VulkanScreenshotter::VulkanScreenshotter() {
+VulkanScreenshotter::VulkanScreenshotter(bool enable_validations) {
   FML_CHECK(::glfwInit() == GLFW_TRUE);
+  PlaygroundSwitches playground_switches;
+  playground_switches.enable_vulkan_validation = enable_validations;
   playground_ =
-      PlaygroundImpl::Create(PlaygroundBackend::kVulkan, PlaygroundSwitches{});
+      PlaygroundImpl::Create(PlaygroundBackend::kVulkan, playground_switches);
 }
 
 std::unique_ptr<Screenshot> VulkanScreenshotter::MakeScreenshot(

shell/platform/android/surface_texture_external_texture.cc

@@ -58,11 +58,17 @@ void SurfaceTextureExternalTexture::Paint(PaintContext& context,
   if (dl_image_) {
     DlAutoCanvasRestore autoRestore(context.canvas, true);
 
-    // The incoming texture is vertically flipped, so we flip it
-    // back. OpenGL's coordinate system has Positive Y equivalent to up, while
-    // Skia's coordinate system has Negative Y equvalent to up.
-    context.canvas->Translate(bounds.x(), bounds.y() + bounds.height());
-    context.canvas->Scale(bounds.width(), -bounds.height());
+    // The incoming texture is vertically flipped, so we flip it back.
+    //
+    // OpenGL's coordinate system has Positive Y equivalent to up, while Skia's
+    // coordinate system (as well as Impeller's) has Negative Y equvalent to up.
+    {
+      // Move (translate) the origin to the bottom-left corner of the image.
+      context.canvas->Translate(bounds.x(), bounds.y() + bounds.height());
+
+      // No change in the X axis, but we need to flip the Y axis.
+      context.canvas->Scale(1, -1);
+    }
 
     if (!transform_.isIdentity()) {
       DlImageColorSource source(dl_image_, DlTileMode::kRepeat,
@@ -73,7 +79,8 @@ void SurfaceTextureExternalTexture::Paint(PaintContext& context,
         paintWithShader = *context.paint;
       }
       paintWithShader.setColorSource(&source);
-      context.canvas->DrawRect(SkRect::MakeWH(1, 1), paintWithShader);
+      context.canvas->DrawRect(SkRect::MakeWH(bounds.width(), bounds.height()),
+                               paintWithShader);
     } else {
       context.canvas->DrawImage(dl_image_, {0, 0}, sampling, context.paint);
     }

shell/platform/android/surface_texture_external_texture_gl.cc

@@ -48,8 +48,11 @@ void SurfaceTextureExternalTextureGL::ProcessFrame(PaintContext& context,
   // Create a
   GrGLTextureInfo textureInfo = {GL_TEXTURE_EXTERNAL_OES, texture_name_,
                                  GL_RGBA8_OES};
-  auto backendTexture =
-      GrBackendTextures::MakeGL(1, 1, skgpu::Mipmapped::kNo, textureInfo);
+  auto backendTexture = GrBackendTextures::MakeGL(
+      /*width=*/bounds.width(),
+      /*height=*/bounds.height(),
+      /*Mipmapped=*/skgpu::Mipmapped::kNo,
+      /*glInfo=*/textureInfo);
   dl_image_ = DlImage::Make(SkImages::BorrowTextureFrom(
       context.gr_context, backendTexture, kTopLeft_GrSurfaceOrigin,
       kRGBA_8888_SkColorType, kPremul_SkAlphaType, nullptr));

sky/packages/sky_engine/LICENSE

@@ -31236,7 +31236,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
   This Source Code Form is "Incompatible With Secondary Licenses", as
   defined by the Mozilla Public License, v. 2.0.
 
-You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/9470ea6b00a588cbd19713919979954403f1465a
+You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/5646ac9669f8b8b15651979875f9a8b8e6acc857
 /third_party/fallback_root_certificates/
 
 --------------------------------------------------------------------------------