archive-gh-me/maplibre-rs
1
0
Fork 0
mirror of https://github.com/maplibre/maplibre-rs.git synced 2025-12-08 19:05:57 +00:00
Code Issues Projects Releases Wiki Activity

Optimize tessellate_layers

Browse Source
This commit is contained in:
Maximilian Ammann 2022-03-25 20:52:54 +01:00
parent 53021bdbb2
commit 491c7945d4
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/io/scheduler.rs
View File

@ -82,22 +82,23 @@ impl ThreadLocalTessellatorState {
request_id: TileRequestID,
data: Box<[u8]>,
) -> Result<(), SendError<TileTessellateResult>> {
if let Ok(tile_request_state) = self.tile_request_state.lock() {
if let Some(tile_request) = tile_request_state.get_tile_request(request_id) {
self.tessellate_layers_with_request(
TileFetchResult::Tile {
coords: tile_request.coords,
data,
},
&tile_request,
request_id,
)
} else {
Ok(())
}
} else {
Ok(())
if let Some(tile_request) = self
.tile_request_state
.lock()
.ok()
.and_then(|tile_request_state| tile_request_state.get_tile_request(request_id))
{
self.tessellate_layers_with_request(
TileFetchResult::Tile {
coords: tile_request.coords,
data,
},
&tile_request,
request_id,
)?;
}
Ok(())
}
fn tessellate_layers_with_request(
@ -191,16 +192,15 @@ impl IOScheduler {
}
pub fn try_populate_cache(&mut self) {
if let Ok(result) = self.result_receiver.try_recv() {
match result {
TileTessellateResult::Tile { request_id } => loop {
if let Ok(mut tile_request_state) = self.tile_request_state.try_lock() {
if let Ok(mut tile_request_state) = self.tile_request_state.try_lock() {
if let Ok(result) = self.result_receiver.try_recv() {
match result {
TileTessellateResult::Tile { request_id } => {
tile_request_state.finish_tile_request(request_id);
break;
}
},
TileTessellateResult::Layer(layer_result) => {
self.tile_cache.push(layer_result);
TileTessellateResult::Layer(layer_result) => {
self.tile_cache.push(layer_result);
}
}
}
}
@ -219,6 +219,8 @@ impl IOScheduler {
) -> Result<(), SendError<TileRequest>> {
let TileRequest { coords, layers } = &tile_request;
// TODO: Optimize: Dropping TileRequest is expensive
if !self.tile_cache.is_layers_missing(coords, layers) {
return Ok(());
}