Clean code

impeller/entity/contents/runtime_effect_contents.cc

@@ -126,7 +126,7 @@ bool RuntimeEffectContents::Render(const ContentContext& renderer,
   options.primitive_type = geometry_result.type;
   options.ApplyToPipelineDescriptor(desc);
 
-  auto pipeline = context->GetPipelineLibrary()->GetPipeline(desc).future.get();
+  auto pipeline = context->GetPipelineLibrary()->GetPipeline(desc).Get();
   if (!pipeline) {
     VALIDATION_LOG << "Failed to get or create runtime effect pipeline.";
     return false;

impeller/playground/imgui/imgui_impl_impeller.cc

@@ -101,9 +101,8 @@ bool ImGui_ImplImpeller_Init(
       desc->SetStencilAttachmentDescriptors(stencil.value());
     }
 
-    bd->pipeline = context->GetPipelineLibrary()
-                       ->GetPipeline(std::move(desc))
-                       .future.get();
+    bd->pipeline =
+        context->GetPipelineLibrary()->GetPipeline(std::move(desc)).Get();
     IM_ASSERT(bd->pipeline != nullptr && "Could not create ImGui pipeline.");
 
     bd->sampler = context->GetSamplerLibrary()->GetSampler({});

impeller/renderer/compute_unittests.cc

@@ -29,7 +29,7 @@ TEST_P(ComputeTest, CanCreateComputePass) {
       SamplePipelineBuilder::MakeDefaultPipelineDescriptor(*context);
   ASSERT_TRUE(pipeline_desc.has_value());
   auto compute_pipeline =
-      context->GetPipelineLibrary()->GetPipeline(pipeline_desc).future.get();
+      context->GetPipelineLibrary()->GetPipeline(pipeline_desc).Get();
   ASSERT_TRUE(compute_pipeline);
 
   auto cmd_buffer = context->CreateCommandBuffer();

impeller/renderer/pipeline.h

@@ -24,6 +24,10 @@ template <typename T>
 struct PipelineFuture {
   std::optional<T> descriptor;
   std::shared_future<std::shared_ptr<Pipeline<T>>> future;
+
+  const std::shared_ptr<Pipeline<T>> Get() const { return future.get(); }
+
+  bool IsValid() const { return future.valid(); }
 };
 
 //------------------------------------------------------------------------------
@@ -104,8 +108,8 @@ class RenderPipelineT {
       return pipeline_;
     }
     did_wait_ = true;
-    if (pipeline_future_.future.valid()) {
-      pipeline_ = pipeline_future_.future.get();
+    if (pipeline_future_.IsValid()) {
+      pipeline_ = pipeline_future_.Get();
     }
     return pipeline_;
   }
@@ -146,8 +150,8 @@ class ComputePipelineT {
       return pipeline_;
     }
     did_wait_ = true;
-    if (pipeline_future_.future.valid()) {
-      pipeline_ = pipeline_future_.future.get();
+    if (pipeline_future_.IsValid()) {
+      pipeline_ = pipeline_future_.Get();
     }
     return pipeline_;
   }

impeller/renderer/renderer_unittests.cc

@@ -55,7 +55,7 @@ TEST_P(RendererTest, CanCreateBoxPrimitive) {
   ASSERT_TRUE(desc.has_value());
   desc->SetSampleCount(SampleCount::kCount4);
   auto box_pipeline =
-      context->GetPipelineLibrary()->GetPipeline(std::move(desc)).future.get();
+      context->GetPipelineLibrary()->GetPipeline(std::move(desc)).Get();
   ASSERT_TRUE(box_pipeline);
 
   // Vertex buffer.
@@ -119,7 +119,7 @@ TEST_P(RendererTest, CanRenderPerspectiveCube) {
   desc->SetCullMode(CullMode::kBackFace);
   desc->SetSampleCount(SampleCount::kCount4);
   auto pipeline =
-      context->GetPipelineLibrary()->GetPipeline(std::move(desc)).future.get();
+      context->GetPipelineLibrary()->GetPipeline(std::move(desc)).Get();
   ASSERT_TRUE(pipeline);
 
   struct Cube {
@@ -208,7 +208,7 @@ TEST_P(RendererTest, CanRenderMultiplePrimitives) {
   ASSERT_TRUE(desc.has_value());
   desc->SetSampleCount(SampleCount::kCount4);
   auto box_pipeline =
-      context->GetPipelineLibrary()->GetPipeline(std::move(desc)).future.get();
+      context->GetPipelineLibrary()->GetPipeline(std::move(desc)).Get();
   ASSERT_TRUE(box_pipeline);
 
   // Vertex buffer.
@@ -279,7 +279,7 @@ TEST_P(RendererTest, CanRenderToTexture) {
       BoxPipelineBuilder::MakeDefaultPipelineDescriptor(*context);
   ASSERT_TRUE(pipeline_desc.has_value());
   auto box_pipeline =
-      context->GetPipelineLibrary()->GetPipeline(pipeline_desc).future.get();
+      context->GetPipelineLibrary()->GetPipeline(pipeline_desc).Get();
   ASSERT_TRUE(box_pipeline);
 
   VertexBufferBuilder<VS::PerVertexData> vertex_builder;
@@ -409,7 +409,7 @@ TEST_P(RendererTest, CanRenderInstanced) {
           ->GetPipeline(PipelineBuilder<VS, FS>::MakeDefaultPipelineDescriptor(
                             *GetContext())
                             ->SetSampleCount(SampleCount::kCount4))
-          .future.get();
+          .Get();
   ASSERT_TRUE(pipeline && pipeline->IsValid());
 
   Command cmd;
@@ -449,7 +449,7 @@ TEST_P(RendererTest, CanBlitTextureToTexture) {
   ASSERT_TRUE(desc.has_value());
   desc->SetSampleCount(SampleCount::kCount4);
   auto mipmaps_pipeline =
-      context->GetPipelineLibrary()->GetPipeline(std::move(desc)).future.get();
+      context->GetPipelineLibrary()->GetPipeline(std::move(desc)).Get();
   ASSERT_TRUE(mipmaps_pipeline);
 
   TextureDescriptor texture_desc;
@@ -559,7 +559,7 @@ TEST_P(RendererTest, CanBlitTextureToBuffer) {
   ASSERT_TRUE(desc.has_value());
   desc->SetSampleCount(SampleCount::kCount4);
   auto mipmaps_pipeline =
-      context->GetPipelineLibrary()->GetPipeline(std::move(desc)).future.get();
+      context->GetPipelineLibrary()->GetPipeline(std::move(desc)).Get();
   ASSERT_TRUE(mipmaps_pipeline);
 
   auto bridge = CreateTextureForFixture("bay_bridge.jpg");
@@ -690,7 +690,7 @@ TEST_P(RendererTest, CanGenerateMipmaps) {
   ASSERT_TRUE(desc.has_value());
   desc->SetSampleCount(SampleCount::kCount4);
   auto mipmaps_pipeline =
-      context->GetPipelineLibrary()->GetPipeline(std::move(desc)).future.get();
+      context->GetPipelineLibrary()->GetPipeline(std::move(desc)).Get();
   ASSERT_TRUE(mipmaps_pipeline);
 
   auto boston = CreateTextureForFixture("boston.jpg", true);
@@ -806,9 +806,8 @@ TEST_P(RendererTest, TheImpeller) {
       PipelineBuilder<VS, FS>::MakeDefaultPipelineDescriptor(*context);
   ASSERT_TRUE(pipeline_descriptor.has_value());
   pipeline_descriptor->SetSampleCount(SampleCount::kCount4);
-  auto pipeline = context->GetPipelineLibrary()
-                      ->GetPipeline(pipeline_descriptor)
-                      .future.get();
+  auto pipeline =
+      context->GetPipelineLibrary()->GetPipeline(pipeline_descriptor).Get();
   ASSERT_TRUE(pipeline && pipeline->IsValid());
 
   auto blue_noise = CreateTextureForFixture("blue_noise.png");
@@ -867,9 +866,8 @@ TEST_P(RendererTest, ArrayUniforms) {
       PipelineBuilder<VS, FS>::MakeDefaultPipelineDescriptor(*context);
   ASSERT_TRUE(pipeline_descriptor.has_value());
   pipeline_descriptor->SetSampleCount(SampleCount::kCount4);
-  auto pipeline = context->GetPipelineLibrary()
-                      ->GetPipeline(pipeline_descriptor)
-                      .future.get();
+  auto pipeline =
+      context->GetPipelineLibrary()->GetPipeline(pipeline_descriptor).Get();
   ASSERT_TRUE(pipeline && pipeline->IsValid());
 
   SinglePassCallback callback = [&](RenderPass& pass) {
@@ -924,9 +922,8 @@ TEST_P(RendererTest, InactiveUniforms) {
       PipelineBuilder<VS, FS>::MakeDefaultPipelineDescriptor(*context);
   ASSERT_TRUE(pipeline_descriptor.has_value());
   pipeline_descriptor->SetSampleCount(SampleCount::kCount4);
-  auto pipeline = context->GetPipelineLibrary()
-                      ->GetPipeline(pipeline_descriptor)
-                      .future.get();
+  auto pipeline =
+      context->GetPipelineLibrary()->GetPipeline(pipeline_descriptor).Get();
   ASSERT_TRUE(pipeline && pipeline->IsValid());
 
   SinglePassCallback callback = [&](RenderPass& pass) {

impeller/runtime_stage/runtime_stage_unittests.cc

@@ -248,8 +248,7 @@ TEST_P(RuntimeStageTest, CanCreatePipelineFromRuntimeStage) {
   desc.SetColorAttachmentDescriptor(0u, color0);
   desc.SetStencilAttachmentDescriptors(stencil0);
   desc.SetStencilPixelFormat(PixelFormat::kDefaultStencil);
-  auto pipeline =
-      GetContext()->GetPipelineLibrary()->GetPipeline(desc).future.get();
+  auto pipeline = GetContext()->GetPipelineLibrary()->GetPipeline(desc).Get();
   ASSERT_NE(pipeline, nullptr);
 }