Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup and more correct simd behavior

Browse Source
This commit is contained in:
Marcel Märtens 2024-05-18 19:15:27 +02:00
parent 667d1aa8f0
commit df5f767610
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/query_server/src/proto.rs
View File

@ -1,4 +1,4 @@
#![allow(non_local_definitions)] //TODO: added 2024-05-15 to update toolchain #![allow(non_local_definitions)] // necessary because of the Protocol derive macro
use protocol::Protocol; use protocol::Protocol;
pub(crate) const VERSION: u16 = 0; pub(crate) const VERSION: u16 = 0;

5
world/src/sim/erosion.rs
View File

@ -606,7 +606,6 @@ fn get_max_slope(
// simd alternative // simd alternative
#[cfg(not(feature = "simd"))] #[cfg(not(feature = "simd"))]
#[derive(Copy, Clone)] #[derive(Copy, Clone)]
#[allow(non_camel_case_types)]
struct M32(u32); struct M32(u32);
#[cfg(not(feature = "simd"))] #[cfg(not(feature = "simd"))]
impl M32 { impl M32 {
@ -614,7 +613,7 @@ impl M32 {
fn splat(x: bool) -> Self { if x { Self(u32::MAX) } else { Self(u32::MIN) } } fn splat(x: bool) -> Self { if x { Self(u32::MAX) } else { Self(u32::MIN) } }
#[inline] #[inline]
fn test(&self, cmp: u32) -> bool { self.0 != cmp } fn any(&self) -> bool { self.0 != 0 }
} }
#[cfg(feature = "simd")] #[cfg(feature = "simd")]
type M32 = std::simd::Mask<i32, 1>; type M32 = std::simd::Mask<i32, 1>;
@ -1333,7 +1332,7 @@ fn erode(
let mut df = 1.0; let mut df = 1.0;
izip!(&mask, &rec_heights, k_fs_fact, k_df_fact).for_each( izip!(&mask, &rec_heights, k_fs_fact, k_df_fact).for_each(
|(&mask_kk, &rec_heights_kk, &k_fs_fact_kk, &k_df_fact_kk)| { |(&mask_kk, &rec_heights_kk, &k_fs_fact_kk, &k_df_fact_kk)| {
if mask_kk.test(0) { if mask_kk.any() {
let h_j = rec_heights_kk; let h_j = rec_heights_kk;
let elev_j = h_j; let elev_j = h_j;
let dh = 0.0.max(new_h_i as SimdType - elev_j); let dh = 0.0.max(new_h_i as SimdType - elev_j);