Enable playgrounds in all tests and fix default sample counts.

The sample counts were invalid after the default assumed rendering to an MSAA target.
egramond · Apr 27, 2022 · 844d400 · 844d400
1 parent a449707
commit 844d400
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/impeller/aiks/aiks_unittests.cc b/impeller/aiks/aiks_unittests.cc
@@ -47,7 +47,7 @@ TEST_F(AiksTest, CanRenderColoredRect) {
                       .AddRect(Rect::MakeXYWH(100.0, 100.0, 100.0, 100.0))
                       .TakePath(),
                   paint);
-  // ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
 }
 
 TEST_F(AiksTest, CanRenderImage) {
@@ -83,7 +83,7 @@ TEST_F(AiksTest, CanRenderStrokes) {
   paint.style = Paint::Style::kStroke;
   canvas.DrawPath(PathBuilder{}.AddLine({200, 100}, {800, 100}).TakePath(),
                   paint);
-  // ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
 }
 
 TEST_F(AiksTest, CanRenderCurvedStrokes) {

diff --git a/impeller/entity/entity_unittests.cc b/impeller/entity/entity_unittests.cc
@@ -22,7 +22,7 @@ TEST_F(EntityTest, CanDrawRect) {
   Entity entity;
   entity.SetPath(PathBuilder{}.AddRect({100, 100, 100, 100}).TakePath());
   entity.SetContents(SolidColorContents::Make(Color::Red()));
-  // ASSERT_TRUE(OpenPlaygroundHere(entity));
+  ASSERT_TRUE(OpenPlaygroundHere(entity));
 }
 
 }  // namespace testing

diff --git a/impeller/renderer/backend/metal/render_pass_mtl.mm b/impeller/renderer/backend/metal/render_pass_mtl.mm
@@ -409,7 +409,12 @@ static bool Bind(PassBindingsCache& pass,
     if (target_sample_count !=
         command.pipeline->GetDescriptor().GetSampleCount()) {
       VALIDATION_LOG << "Pipeline for command and the render target disagree "
-                        "on sample counts.";
+                        "on sample counts (target was "
+                     << static_cast<uint64_t>(target_sample_count)
+                     << " but pipeline wanted "
+                     << static_cast<uint64_t>(
+                            command.pipeline->GetDescriptor().GetSampleCount())
+                     << ").";
       return false;
     }
 

diff --git a/impeller/renderer/renderer_unittests.cc b/impeller/renderer/renderer_unittests.cc
@@ -36,6 +36,8 @@ TEST_F(RendererTest, CanCreateBoxPrimitive) {
   ASSERT_TRUE(context);
   using BoxPipelineBuilder = PipelineBuilder<VS, FS>;
   auto desc = BoxPipelineBuilder::MakeDefaultPipelineDescriptor(*context);
+  ASSERT_TRUE(desc.has_value());
+  desc->SetSampleCount(SampleCount::kCount4);
   auto box_pipeline =
       context->GetPipelineLibrary()->GetRenderPipeline(std::move(desc)).get();
   ASSERT_TRUE(box_pipeline);
@@ -89,7 +91,7 @@ TEST_F(RendererTest, CanCreateBoxPrimitive) {
     }
     return true;
   };
-  // OpenPlaygroundHere(callback);
+  OpenPlaygroundHere(callback);
 }
 
 TEST_F(RendererTest, CanRenderMultiplePrimitives) {
@@ -159,7 +161,7 @@ TEST_F(RendererTest, CanRenderMultiplePrimitives) {
 
     return true;
   };
-  // OpenPlaygroundHere(callback);
+  OpenPlaygroundHere(callback);
 }
 
 TEST_F(RendererTest, CanRenderToTexture) {