Merge fixes

Author: adrian-cojocaru

src/mbgl/map/map.cpp

@@ -569,13 +569,14 @@ void Map::setTileLodZoomShift(double shift) {
 
 double Map::getTileLodZoomShift() const {
     return impl->tileLodZoomShift;
+}
 
-    ClientOptions Map::getClientOptions() const {
-        return impl->fileSource ? impl->fileSource->getClientOptions() : ClientOptions();
-    }
+ClientOptions Map::getClientOptions() const {
+    return impl->fileSource ? impl->fileSource->getClientOptions() : ClientOptions();
+}
 
-    const std::unique_ptr<util::ActionJournal>& Map::getActionJournal() {
-        return impl->actionJournal;
-    }
+const std::unique_ptr<util::ActionJournal>& Map::getActionJournal() {
+    return impl->actionJournal;
+}
 
 } // namespace mbgl

src/mbgl/renderer/render_orchestrator.cpp

@@ -195,10 +195,10 @@ std::unique_ptr<RenderTree> RenderOrchestrator::createRenderTree(
                                         .glyphManager = glyphManager,
                                         .prefetchZoomDelta = updateParameters->prefetchZoomDelta,
                                         .threadPool = threadPool,
-                                        .updateParameters->tileLodMinRadius,
-                                        .updateParameters->tileLodScale,
-                                        .updateParameters->tileLodPitchThreshold,
-                                        .updateParameters->tileLodZoomShift,
+                                        .tileLodMinRadius = updateParameters->tileLodMinRadius,
+                                        .tileLodScale = updateParameters->tileLodScale,
+                                        .tileLodPitchThreshold = updateParameters->tileLodPitchThreshold,
+                                        .tileLodZoomShift = updateParameters->tileLodZoomShift,
                                         .dynamicTextureAtlas = dynamicTextureAtlas};
 
     glyphManager->setURL(updateParameters->glyphURL);

src/mbgl/renderer/renderer_impl.cpp

@@ -14,6 +14,7 @@
 #include <mbgl/renderer/render_static_data.hpp>
 #include <mbgl/renderer/render_tree.hpp>
 #include <mbgl/renderer/update_parameters.hpp>
+#include <mbgl/shaders/program_parameters.hpp>
 #include <mbgl/util/convert.hpp>
 #include <mbgl/util/string.hpp>
 #include <mbgl/util/logging.hpp>