From 8bf8e99085ccbe644036e7e7b947a5549ad245a3 Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Wed, 14 Dec 2022 10:55:46 -0800 Subject: [PATCH] Revert "[Impeller] Speculatively attempt to fix Metal PSO construction errors on host targets. (#38229)" This reverts commit b97d3545f3fd2e8fa3c5de381bab88fd3b7c1729. --- .../backend/metal/pipeline_library_mtl.mm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/impeller/renderer/backend/metal/pipeline_library_mtl.mm b/impeller/renderer/backend/metal/pipeline_library_mtl.mm index eb220f4f0ff39..85272ef16fad5 100644 --- a/impeller/renderer/backend/metal/pipeline_library_mtl.mm +++ b/impeller/renderer/backend/metal/pipeline_library_mtl.mm @@ -3,10 +3,8 @@ // found in the LICENSE file. #include "impeller/renderer/backend/metal/pipeline_library_mtl.h" - #include -#include "flutter/fml/build_config.h" #include "flutter/fml/container.h" #include "impeller/base/promise.h" #include "impeller/renderer/backend/metal/compute_pipeline_mtl.h" @@ -133,19 +131,9 @@ )); promise->set_value(new_pipeline); }; - auto mtl_descriptor = GetMTLRenderPipelineDescriptor(descriptor); -#if FML_OS_IOS - [device_ newRenderPipelineStateWithDescriptor:mtl_descriptor + [device_ newRenderPipelineStateWithDescriptor:GetMTLRenderPipelineDescriptor( + descriptor) completionHandler:completion_handler]; -#else // FML_OS_IOS - // TODO(116919): Investigate and revert speculative fix to make MTL pipeline - // state creation use a worker. - NSError* error = nil; - auto render_pipeline_state = - [device_ newRenderPipelineStateWithDescriptor:mtl_descriptor - error:&error]; - completion_handler(render_pipeline_state, error); -#endif // FML_OS_IOS return pipeline_future; }