Skip to content

Commit

Permalink
Merge pull request #189 from EmbarkStudios/remove-spirv-std-dep
Browse files Browse the repository at this point in the history
Remove the spirv-std dependency
  • Loading branch information
bitshifter authored Jun 1, 2021
2 parents 466d07f + da1071f commit 5435e1e
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 25 deletions.
1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ mint = { version = "0.5", optional = true, default-features = false }
num-traits = { version = "0.2.14", optional = true, default-features = false }
rand = { version = "0.8", optional = true, default-features = false }
serde = { version = "1.0", optional = true, features = ["derive"] }
spirv-std = { version = "0.4.0-alpha.7", optional = true }

[dev-dependencies]
criterion = { version = "0.3", features = ["html_reports"] }
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ mod vec3;
mod vec4;
mod vec_mask;

#[cfg(feature = "spirv-std")]
#[cfg(target_arch = "spirv")]
mod spirv;

#[cfg(feature = "transform-types")]
Expand Down
23 changes: 0 additions & 23 deletions src/spirv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,3 @@ unsupported_features! {
"serde",
"std",
}

use spirv_std::vector::Vector;

unsafe impl Vector<bool, 2> for crate::BVec2 {}
unsafe impl Vector<bool, 3> for crate::BVec3 {}
unsafe impl Vector<bool, 4> for crate::BVec4 {}

unsafe impl Vector<f32, 2> for crate::Vec2 {}
unsafe impl Vector<f32, 3> for crate::Vec3 {}
unsafe impl Vector<f32, 3> for crate::Vec3A {}
unsafe impl Vector<f32, 4> for crate::Vec4 {}

unsafe impl Vector<f64, 2> for crate::DVec2 {}
unsafe impl Vector<f64, 3> for crate::DVec3 {}
unsafe impl Vector<f64, 4> for crate::DVec4 {}

unsafe impl Vector<u32, 2> for crate::UVec2 {}
unsafe impl Vector<u32, 3> for crate::UVec3 {}
unsafe impl Vector<u32, 4> for crate::UVec4 {}

unsafe impl Vector<i32, 2> for crate::IVec2 {}
unsafe impl Vector<i32, 3> for crate::IVec3 {}
unsafe impl Vector<i32, 4> for crate::IVec4 {}

0 comments on commit 5435e1e

Please sign in to comment.