tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor optimizations (#2091)

Browse Source
This commit is contained in:
Tim Sylvester
2024-02-13 07:40:25 -08:00
committed by GitHub
parent 0ec638f226
commit 8e5fc4c198
12 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mbgl/gfx/vertex_vector.hpp
View File

@@ -98,6 +98,8 @@ public:
v.clear();
}
void reserve(std::size_t count) { v.reserve(count); }
/// Indicate that this shared vertex vector instance will no longer be updated.
void release() {
#if MLN_DRAWABLE_RENDERER

8
src/mbgl/layout/symbol_projection.cpp
View File

@@ -146,6 +146,9 @@ void addDynamicAttributes(const Point<float>& anchorPoint,
void hideGlyphs(size_t numGlyphs, gfx::VertexVector<gfx::Vertex<SymbolDynamicLayoutAttributes>>& dynamicVertexArray) {
const Point<float> offscreenPoint = {-INFINITY, -INFINITY};
if (dynamicVertexArray.empty()) {
dynamicVertexArray.reserve(4 * numGlyphs);
}
for (size_t i = 0; i < numGlyphs; i++) {
addDynamicAttributes(offscreenPoint, 0, dynamicVertexArray);
}
@@ -270,7 +273,6 @@ std::optional<std::pair<PlacedGlyph, PlacedGlyph>> placeFirstAndLastGlyph(const
const float firstGlyphOffset = symbol.glyphOffsets.front();
const float lastGlyphOffset = symbol.glyphOffsets.back();
;
std::optional<PlacedGlyph> firstPlacedGlyph = placeGlyphAlongLine(fontScale * firstGlyphOffset,
lineOffsetX,
@@ -365,6 +367,7 @@ PlacementResult placeGlyphsAlongLine(const PlacedSymbol& symbol,
}
}
placedGlyphs.reserve(symbol.glyphOffsets.size());
placedGlyphs.push_back(firstAndLastGlyph->first);
for (size_t glyphIndex = 1; glyphIndex < symbol.glyphOffsets.size() - 1; glyphIndex++) {
const float glyphOffsetX = symbol.glyphOffsets[glyphIndex];
@@ -429,6 +432,9 @@ PlacementResult placeGlyphsAlongLine(const PlacedSymbol& symbol,
// The number of placedGlyphs must equal the number of glyphOffsets, which
// must correspond to the number of glyph vertices There may be 0 glyphs
// here, if a label consists entirely of glyphs that have 0x0 dimensions
if (dynamicVertexArray.empty()) {
dynamicVertexArray.reserve(4 * placedGlyphs.size());
}
for (auto& placedGlyph : placedGlyphs) {
addDynamicAttributes(placedGlyph.point, placedGlyph.angle, dynamicVertexArray);
}

2
src/mbgl/renderer/layers/render_background_layer.cpp
View File

@@ -215,8 +215,6 @@ void RenderBackgroundLayer::update(gfx::ShaderRegistry& shaders,
const std::shared_ptr<UpdateParameters>&,
[[maybe_unused]] const RenderTree& renderTree,
[[maybe_unused]] UniqueChangeRequestVec& changes) {
std::unique_lock<std::mutex> guard(mutex);
const auto zoom = state.getIntegerZoom();
const auto tileCover = util::tileCover(state, zoom);

2
src/mbgl/renderer/layers/render_circle_layer.cpp
View File

@@ -276,8 +276,6 @@ void RenderCircleLayer::update(gfx::ShaderRegistry& shaders,
[[maybe_unused]] const std::shared_ptr<UpdateParameters>&,
[[maybe_unused]] const RenderTree& renderTree,
UniqueChangeRequestVec& changes) {
std::unique_lock<std::mutex> guard(mutex);
if (!renderTiles || renderTiles->empty()) {
removeAllDrawables();
return;

2
src/mbgl/renderer/layers/render_custom_drawable_layer.cpp
View File

@@ -65,8 +65,6 @@ void RenderCustomDrawableLayer::update(gfx::ShaderRegistry& shaders,
const std::shared_ptr<UpdateParameters>& updateParameters,
const RenderTree& renderTree,
UniqueChangeRequestVec& changes) {
std::unique_lock<std::mutex> guard(mutex);
// check if host changed and update
bool hostChanged = (host != impl(baseImpl).host);
if (hostChanged) {

2
src/mbgl/renderer/layers/render_custom_layer.cpp
View File

@@ -125,8 +125,6 @@ void RenderCustomLayer::update([[maybe_unused]] gfx::ShaderRegistry& shaders,
const std::shared_ptr<UpdateParameters>&,
[[maybe_unused]] const RenderTree& renderTree,
[[maybe_unused]] UniqueChangeRequestVec& changes) {
std::unique_lock<std::mutex> guard(mutex);
// create layer group
if (!layerGroup) {
if (auto layerGroup_ = context.createLayerGroup(layerIndex, /*initialCapacity=*/1, getID())) {

2
src/mbgl/renderer/layers/render_fill_layer.cpp
View File

@@ -400,8 +400,6 @@ void RenderFillLayer::update(gfx::ShaderRegistry& shaders,
const std::shared_ptr<UpdateParameters>&,
[[maybe_unused]] const RenderTree& renderTree,
[[maybe_unused]] UniqueChangeRequestVec& changes) {
std::unique_lock<std::mutex> guard(mutex);
if (!renderTiles || renderTiles->empty()) {
removeAllDrawables();
return;

2
src/mbgl/renderer/layers/render_heatmap_layer.cpp
View File

@@ -292,8 +292,6 @@ void RenderHeatmapLayer::update(gfx::ShaderRegistry& shaders,
const std::shared_ptr<UpdateParameters>&,
[[maybe_unused]] const RenderTree& renderTree,
UniqueChangeRequestVec& changes) {
std::unique_lock<std::mutex> guard(mutex);
if (!renderTiles || renderTiles->empty()) {
removeAllDrawables();
return;

2
src/mbgl/renderer/layers/render_hillshade_layer.cpp
View File

@@ -304,8 +304,6 @@ void RenderHillshadeLayer::update(gfx::ShaderRegistry& shaders,
const std::shared_ptr<UpdateParameters>&,
[[maybe_unused]] const RenderTree& renderTree,
UniqueChangeRequestVec& changes) {
std::unique_lock<std::mutex> guard(mutex);
if (!renderTiles || renderTiles->empty()) {
removeAllDrawables();
return;

2
src/mbgl/renderer/layers/render_line_layer.cpp
View File

@@ -353,8 +353,6 @@ void RenderLineLayer::update(gfx::ShaderRegistry& shaders,
const std::shared_ptr<UpdateParameters>&,
[[maybe_unused]] const RenderTree& renderTree,
[[maybe_unused]] UniqueChangeRequestVec& changes) {
std::unique_lock<std::mutex> guard(mutex);
if (!renderTiles || renderTiles->empty()) {
removeAllDrawables();
return;

2
src/mbgl/renderer/layers/render_raster_layer.cpp
View File

@@ -256,8 +256,6 @@ void RenderRasterLayer::update(gfx::ShaderRegistry& shaders,
const std::shared_ptr<UpdateParameters>&,
[[maybe_unused]] const RenderTree& renderTree,
[[maybe_unused]] UniqueChangeRequestVec& changes) {
std::unique_lock<std::mutex> guard(mutex);
if ((!renderTiles || renderTiles->empty()) && !imageData) {
if (layerGroup) {
stats.drawablesRemoved += layerGroup->clearDrawables();

2
src/mbgl/renderer/render_layer.hpp
View File

@@ -302,8 +302,6 @@ protected:
// Current renderable status as specified by the markLayerRenderable event
bool isRenderable{false};
std::mutex mutex;
struct Stats {
size_t propertyEvaluations = 0;
size_t drawablesAdded = 0;