From 5e8c29078248a28e67411a7a1d5cf714759d5b68 Mon Sep 17 00:00:00 2001 From: Matej Knopp Date: Mon, 5 Jun 2023 14:13:23 +0200 Subject: [PATCH] Fix clang tidy error and crash --- impeller/renderer/backend/metal/context_mtl.mm | 2 +- impeller/renderer/backend/metal/formats_mtl.mm | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/impeller/renderer/backend/metal/context_mtl.mm b/impeller/renderer/backend/metal/context_mtl.mm index 20af3b87c7141..d24ddae9569d2 100644 --- a/impeller/renderer/backend/metal/context_mtl.mm +++ b/impeller/renderer/backend/metal/context_mtl.mm @@ -228,7 +228,7 @@ static bool DeviceSupportsComputeSubgroups(id device) { auto context = std::shared_ptr(new ContextMTL( device, MTLShaderLibraryFromFileData(device, shader_libraries_data, label), - worker_task_runner, std::move(is_gpu_disabled_sync_switch))); + std::move(worker_task_runner), std::move(is_gpu_disabled_sync_switch))); if (!context->IsValid()) { FML_LOG(ERROR) << "Could not create Metal context."; return nullptr; diff --git a/impeller/renderer/backend/metal/formats_mtl.mm b/impeller/renderer/backend/metal/formats_mtl.mm index aece8944aa72d..9e96d295b76f7 100644 --- a/impeller/renderer/backend/metal/formats_mtl.mm +++ b/impeller/renderer/backend/metal/formats_mtl.mm @@ -64,8 +64,13 @@ auto des = [[MTLDepthStencilDescriptor alloc] init]; - des.depthCompareFunction = ToMTLCompareFunction(depth->depth_compare); - des.depthWriteEnabled = depth->depth_write_enabled; + // These temporary variables are necessary for clang-tidy (Fuchsia LLVM + // version 17.0.0git) to not crash. + auto compare_function = ToMTLCompareFunction(depth->depth_compare); + auto depth_write_enabled = depth->depth_write_enabled; + + des.depthCompareFunction = compare_function; + des.depthWriteEnabled = depth_write_enabled; if (front.has_value()) { des.frontFaceStencil = ToMTLStencilDescriptor(front.value());