Tweak code

impeller/renderer/backend/gles/pipeline_library_gles.cc

@@ -176,7 +176,7 @@ bool PipelineLibraryGLES::IsValid() const {
 PipelineFuture<PipelineDescriptor> PipelineLibraryGLES::GetPipeline(
     PipelineDescriptor descriptor) {
   if (auto found = pipelines_.find(descriptor); found != pipelines_.end()) {
-    return {descriptor, found->second};
+    return found->second;
   }
 
   if (!reactor_) {
@@ -200,7 +200,7 @@ PipelineFuture<PipelineDescriptor> PipelineLibraryGLES::GetPipeline(
       std::promise<std::shared_ptr<Pipeline<PipelineDescriptor>>>>();
   auto pipeline_future =
       PipelineFuture<PipelineDescriptor>{descriptor, promise->get_future()};
-  pipelines_[descriptor] = pipeline_future.future;
+  pipelines_[descriptor] = pipeline_future;
   auto weak_this = weak_from_this();
 
   auto result = reactor_->AddOperation(

impeller/renderer/backend/metal/pipeline_library_mtl.mm

@@ -89,7 +89,7 @@
 PipelineFuture<PipelineDescriptor> PipelineLibraryMTL::GetPipeline(
     PipelineDescriptor descriptor) {
   if (auto found = pipelines_.find(descriptor); found != pipelines_.end()) {
-    return {descriptor, found->second};
+    return found->second;
   }
 
   if (!IsValid()) {
@@ -102,7 +102,7 @@
       std::promise<std::shared_ptr<Pipeline<PipelineDescriptor>>>>();
   auto pipeline_future =
       PipelineFuture<PipelineDescriptor>{descriptor, promise->get_future()};
-  pipelines_[descriptor] = pipeline_future.future;
+  pipelines_[descriptor] = pipeline_future;
   auto weak_this = weak_from_this();
 
   auto completion_handler =
@@ -141,7 +141,7 @@
     ComputePipelineDescriptor descriptor) {
   if (auto found = compute_pipelines_.find(descriptor);
       found != compute_pipelines_.end()) {
-    return {descriptor, found->second};
+    return found->second;
   }
 
   if (!IsValid()) {
@@ -155,7 +155,7 @@
       std::promise<std::shared_ptr<Pipeline<ComputePipelineDescriptor>>>>();
   auto pipeline_future = PipelineFuture<ComputePipelineDescriptor>{
       descriptor, promise->get_future()};
-  compute_pipelines_[descriptor] = pipeline_future.future;
+  compute_pipelines_[descriptor] = pipeline_future;
   auto weak_this = weak_from_this();
 
   auto completion_handler =

impeller/renderer/backend/vulkan/pipeline_library_vk.cc

@@ -57,7 +57,7 @@ PipelineFuture<PipelineDescriptor> PipelineLibraryVK::GetPipeline(
     PipelineDescriptor descriptor) {
   Lock lock(pipelines_mutex_);
   if (auto found = pipelines_.find(descriptor); found != pipelines_.end()) {
-    return {descriptor, found->second};
+    return found->second;
   }
 
   if (!IsValid()) {
@@ -70,7 +70,7 @@ PipelineFuture<PipelineDescriptor> PipelineLibraryVK::GetPipeline(
       std::promise<std::shared_ptr<Pipeline<PipelineDescriptor>>>>();
   auto pipeline_future =
       PipelineFuture<PipelineDescriptor>{descriptor, promise->get_future()};
-  pipelines_[descriptor] = pipeline_future.future;
+  pipelines_[descriptor] = pipeline_future;
 
   auto weak_this = weak_from_this();
 

impeller/renderer/compute_pipeline_descriptor.h

@@ -53,10 +53,4 @@ class ComputePipelineDescriptor final
   std::shared_ptr<const ShaderFunction> entrypoint_;
 };
 
-using ComputePipelineMap = std::unordered_map<
-    ComputePipelineDescriptor,
-    std::shared_future<std::shared_ptr<Pipeline<ComputePipelineDescriptor>>>,
-    ComparableHash<ComputePipelineDescriptor>,
-    ComparableEqual<ComputePipelineDescriptor>>;
-
 }  // namespace impeller

impeller/renderer/pipeline_descriptor.h

@@ -138,10 +138,4 @@ class PipelineDescriptor final : public Comparable<PipelineDescriptor> {
   PrimitiveType primitive_type_ = PrimitiveType::kTriangle;
 };
 
-using PipelineMap = std::unordered_map<
-    PipelineDescriptor,
-    std::shared_future<std::shared_ptr<Pipeline<PipelineDescriptor>>>,
-    ComparableHash<PipelineDescriptor>,
-    ComparableEqual<PipelineDescriptor>>;
-
 }  // namespace impeller

impeller/renderer/pipeline_library.h

@@ -15,6 +15,17 @@ namespace impeller {
 
 class Context;
 
+using PipelineMap = std::unordered_map<PipelineDescriptor,
+                                       PipelineFuture<PipelineDescriptor>,
+                                       ComparableHash<PipelineDescriptor>,
+                                       ComparableEqual<PipelineDescriptor>>;
+
+using ComputePipelineMap =
+    std::unordered_map<ComputePipelineDescriptor,
+                       PipelineFuture<ComputePipelineDescriptor>,
+                       ComparableHash<ComputePipelineDescriptor>,
+                       ComparableEqual<ComputePipelineDescriptor>>;
+
 class PipelineLibrary : public std::enable_shared_from_this<PipelineLibrary> {
  public:
   virtual ~PipelineLibrary();