From b188487d6460f0f2456723211f9c9c3996a0daa1 Mon Sep 17 00:00:00 2001 From: mwilsnd Date: Wed, 28 Aug 2024 11:17:50 -0400 Subject: [PATCH] Metal backend fixes --- src/mbgl/mtl/context.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mbgl/mtl/context.cpp b/src/mbgl/mtl/context.cpp index d56f13e3a36..2710b9cc801 100644 --- a/src/mbgl/mtl/context.cpp +++ b/src/mbgl/mtl/context.cpp @@ -103,7 +103,7 @@ UniqueShaderProgram Context::createProgram(shaders::BuiltIn shaderID, std::string defineStr; std::vector rawDefines; rawDefines.reserve(2 * numDefines); - const auto addDefine = [&rawDefines](const auto& pair) { + const auto addDefine = [&rawDefines, &defineStr](const auto& pair) { const auto* nsKey = NS::String::string(pair.first.data(), NS::UTF8StringEncoding); const auto* nsVal = NS::String::string(pair.second.data(), NS::UTF8StringEncoding); rawDefines.insert(std::next(rawDefines.begin(), rawDefines.size() / 2), nsKey); @@ -168,7 +168,7 @@ UniqueShaderProgram Context::createProgram(shaders::BuiltIn shaderID, fragmentFunction = NS::TransferPtr(library->newFunction(nsFragName)); if (!fragmentFunction) { Log::Error(Event::Shader, name + " missing fragment function " + fragmentName.data()); - observer->onShaderCompileFailed(shaderID, gfx::Backend::Type::Metal, additionalDefines); + observer->onShaderCompileFailed(shaderID, gfx::Backend::Type::Metal, defineStr); assert(false); return nullptr; }