Skip to content

F32 linear algebra slight improvement #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
westbot657 merged 6 commits into from
Jan 25, 2026
Merged

F32 linear algebra slight improvement #18

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ba8d29d
Refactor f32 queue to be contiguous
Fernthedev Jan 24, 2026
07021fd
Refactor string handling to use CString to reduce interop
Fernthedev Jan 24, 2026
6b520d1
Improving string management barely
Fernthedev Jan 24, 2026
768c950
Revert "Improving string management barely"
Fernthedev Jan 24, 2026
ecfe391
Revert "Refactor string handling to use CString to reduce interop"
Fernthedev Jan 24, 2026
258fe22
Optimize slightly more
Fernthedev Jan 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 30 additions & 28 deletions turing/src/engine/wasm_engine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@ impl Param {
memory: &Memory,
caller: &Store<WasiP1Ctx>,
) -> Self {

macro_rules! dequeue {
($typ:tt :: $init:tt; $x:tt ) => {
{ let mut s = data.write();
let arr = s.f32_queue.drain(..$x).collect::<Vec<f32>>();
Param::$typ(glam::$typ::$init(arr.as_slice().try_into().unwrap())) }
};
($typ:tt :: $init:tt; $x:tt ) => {{
let mut s = data.write();
Param::$typ(glam::$typ::$init(
s.f32_queue.make_contiguous(),
))
}};
}

match typ {
Expand Down Expand Up @@ -142,26 +142,28 @@ impl Param {
Param::Error(st)
}
DataType::Void => Param::Void,
DataType::Vec2 => dequeue!(Vec2::from_array; 2),
DataType::Vec3 => dequeue!(Vec3::from_array; 3),
DataType::RustVec4 | DataType::ExtVec4 => dequeue!(Vec4::from_array; 4),
DataType::RustQuat | DataType::ExtQuat => dequeue!(Quat::from_array; 4),
DataType::RustMat4 | DataType::ExtMat4 => dequeue!(Mat4::from_cols_array; 16),
_ => unreachable!("Cannot convert to {} from wasm value", typ)


DataType::Vec2 => dequeue!(Vec2::from_slice; 2),
DataType::Vec3 => dequeue!(Vec3::from_slice; 3),
DataType::RustVec4 | DataType::ExtVec4 => dequeue!(Vec4::from_slice; 4),
DataType::RustQuat | DataType::ExtQuat => dequeue!(Quat::from_slice; 4),
DataType::RustMat4 | DataType::ExtMat4 => dequeue!(Mat4::from_cols_slice; 16),
_ => unreachable!("Cannot convert to {} from wasm value", typ),
}
}

pub fn into_wasm_val(self, data: &Arc<RwLock<EngineDataState>>) -> Result<Option<Val>> {
let mut s = data.write();
macro_rules! enqueue {
( $v:tt ; $sz:tt ) => {
{ s.f32_queue.append(&mut $v.to_array().into());
Val::I32($sz) }
};
($m:tt # $sz:tt) => {
{ s.f32_queue.append(&mut $m.to_cols_array().into());
Val::I32($sz) }
}
( $v:tt ; $sz:tt ) => {{
s.f32_queue.append(&mut $v.to_array().into());
Val::I32($sz)
}};
($m:tt # $sz:tt) => {{
s.f32_queue.append(&mut $m.to_cols_array().into());
Val::I32($sz)
}};
}
Ok(Some(match self {
Param::I8(i) => Val::I32(i as i32),
Expand Down Expand Up @@ -210,14 +212,14 @@ impl Params {

let mut s = data.write();
macro_rules! enqueue {
( $v:tt ; $sz:tt ) => {
{ s.f32_queue.append(&mut $v.to_array().into());
Ok(Val::I32($sz)) }
};
($m:tt # $sz:tt) => {
{ s.f32_queue.append(&mut $m.to_cols_array().into());
Ok(Val::I32($sz)) }
}
( $v:tt ; $sz:tt ) => {{
s.f32_queue.append(&mut $v.to_array().into());
Ok(Val::I32($sz))
}};
($m:tt # $sz:tt) => {{
s.f32_queue.append(&mut $m.to_cols_array().into());
Ok(Val::I32($sz))
}};
}

self.params.into_iter().map(|p|
Expand Down
Loading