Fix double unmaps.

This commit is contained in:
Joshua Yanovski 2022-08-28 19:14:01 -07:00
parent d2cc58b5a0
commit 1dc6757668
6 changed files with 3 additions and 7 deletions

View File

@ -7,7 +7,6 @@
allocator_api, allocator_api,
array_chunks, array_chunks,
associated_type_defaults, associated_type_defaults,
bool_to_option,
coerce_unsized, coerce_unsized,
dispatch_from_dyn, dispatch_from_dyn,
exclusive_wrapper, exclusive_wrapper,

View File

@ -1,4 +1,4 @@
#![feature(bool_to_option, let_else, btree_drain_filter)] #![feature(let_else, btree_drain_filter)]
#![allow(clippy::option_map_unit_fn)] #![allow(clippy::option_map_unit_fn)]
mod aura; mod aura;

View File

@ -1,6 +1,5 @@
#![deny(unsafe_code)] #![deny(unsafe_code)]
#![deny(clippy::clone_on_ref_ptr)] #![deny(clippy::clone_on_ref_ptr)]
#![feature(bool_to_option)]
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
#[global_allocator] #[global_allocator]

View File

@ -7,7 +7,6 @@
array_methods, array_methods,
array_windows, array_windows,
array_zip, array_zip,
bool_to_option,
drain_filter, drain_filter,
once_cell, once_cell,
stmt_expr_attributes, stmt_expr_attributes,

View File

@ -1547,9 +1547,9 @@ impl/*<V: RectRasterableVol>*/ Terrain<V> {
frustum_last_plane_index: 0, frustum_last_plane_index: 0,
}); });
} else if let Some(chunk) = self.chunks.get_mut(&pos) { } else if let Some(chunk) = self.chunks.get_mut(&pos) {
// There was an update that didn't require a remesh (probably related to /* // There was an update that didn't require a remesh (probably related to
// non-glowing sprites) so we just update those. // non-glowing sprites) so we just update those.
renderer.unmap_instances(&mut response.sprite_instances.1); renderer.unmap_instances(&mut response.sprite_instances.1); */
chunk.sprite_instances = response.sprite_instances; chunk.sprite_instances = response.sprite_instances;
chunk.blocks_of_interest = response.blocks_of_interest; chunk.blocks_of_interest = response.blocks_of_interest;
} else { } else {

View File

@ -10,7 +10,6 @@
#![feature( #![feature(
arbitrary_enum_discriminant, arbitrary_enum_discriminant,
associated_const_equality, associated_const_equality,
bool_to_option,
generic_associated_types, generic_associated_types,
label_break_value, label_break_value,
option_zip, option_zip,