-
Notifications
You must be signed in to change notification settings - Fork 244
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.
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
Add ScalarOrVector<S>
trait
#1030
Open
BeastLe9enD
wants to merge
2
commits into
EmbarkStudios:main
Choose a base branch
from
ProjectKML:vector-or-scalar-traits
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,7 @@ | ||
//! Traits related to vectors. | ||
|
||
use crate::scalar::Scalar; | ||
|
||
/// Abstract trait representing a SPIR-V vector type. | ||
/// | ||
/// # Safety | ||
|
@@ -23,3 +25,54 @@ unsafe impl Vector<u32, 4> for glam::UVec4 {} | |
unsafe impl Vector<i32, 2> for glam::IVec2 {} | ||
unsafe impl Vector<i32, 3> for glam::IVec3 {} | ||
unsafe impl Vector<i32, 4> for glam::IVec4 {} | ||
|
||
/// Abstract trait representing a SPIR-V scalar or vector type. | ||
/// | ||
/// # Safety | ||
/// Implementing this trait on non-simd-vector/scalar types breaks assumptions of other unsafe code, and | ||
/// should not be done. | ||
pub unsafe trait ScalarOrVector { | ||
/// The scalar type | ||
type Scalar; | ||
|
||
/// The dimension of the vector, or 1 if it is a scalar | ||
const DIM: usize; | ||
} | ||
|
||
unsafe impl<S: Scalar> ScalarOrVector for S { | ||
type Scalar = S; | ||
const DIM: usize = 1; | ||
} | ||
|
||
macro_rules! impl_vector_or_scalar { | ||
($(for $scalar_ty:ty, $dim: literal: unsafe impl ScalarOrVector for $typ:ty;)+) => { | ||
$( | ||
unsafe impl ScalarOrVector for $typ { | ||
type Scalar = $scalar_ty; | ||
const DIM: usize = $dim; | ||
} | ||
)+ | ||
} | ||
} | ||
|
||
impl_vector_or_scalar! { | ||
for bool, 2: unsafe impl ScalarOrVector for glam::BVec2; | ||
for bool, 3: unsafe impl ScalarOrVector for glam::BVec3; | ||
for bool, 4: unsafe impl ScalarOrVector for glam::BVec4; | ||
|
||
for f32, 2: unsafe impl ScalarOrVector for glam::Vec2; | ||
for f32, 3: unsafe impl ScalarOrVector for glam::Vec3; | ||
for f32, 4: unsafe impl ScalarOrVector for glam::Vec4; | ||
|
||
for f64, 2: unsafe impl ScalarOrVector for glam::DVec2; | ||
for f64, 3: unsafe impl ScalarOrVector for glam::DVec3; | ||
for f64, 4: unsafe impl ScalarOrVector for glam::DVec4; | ||
|
||
for u32, 2: unsafe impl ScalarOrVector for glam::UVec2; | ||
for u32, 3: unsafe impl ScalarOrVector for glam::UVec3; | ||
for u32, 4: unsafe impl ScalarOrVector for glam::UVec4; | ||
|
||
for i32, 2: unsafe impl ScalarOrVector for glam::IVec2; | ||
for i32, 3: unsafe impl ScalarOrVector for glam::IVec3; | ||
for i32, 4: unsafe impl ScalarOrVector for glam::IVec4; | ||
} | ||
Comment on lines
+58
to
+78
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It would be nicer to make this one per line, like |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you use std::num::NonZeroUsize here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, theoretically you could do it, but I am not sure if it is currently supported in Rust-Gpu.