abi layout: glam::BVec support

Author: Firestar99

crates/rustc_codegen_spirv/src/abi.rs

@@ -1241,14 +1241,14 @@ fn trans_intrinsic_type<'tcx>(
             let (element, count) =
                 trans_glam_like_struct(cx, span, ty, args, "`#[spirv(vector)]`")?;
             match cx.lookup_type(element) {
-                SpirvType::Float { .. } | SpirvType::Integer { .. } => (),
+                SpirvType::Bool | SpirvType::Float { .. } | SpirvType::Integer { .. } => (),
                 ty => {
                     return Err(cx
                         .tcx
                         .dcx()
                         .struct_span_err(
                             span,
-                            "`#[spirv(vector)]` type fields must all be floats or integers",
+                            "`#[spirv(vector)]` type fields must all be floats, integers or bools",
                         )
                         .with_note(format!("field type is {}", ty.debug(element, cx)))
                         .emit());

crates/spirv-std/src/vector.rs

@@ -49,6 +49,7 @@ impl_vector! {
     f64: glam::DVec2 => 2, glam::DVec3 => 3, glam::DVec4 => 4;
     u32: glam::UVec2 => 2, glam::UVec3 => 3, glam::UVec4 => 4;
     i32: glam::IVec2 => 2, glam::IVec3 => 3, glam::IVec4 => 4;
+    bool: glam::BVec2 => 2, glam::BVec3 => 3, glam::BVec4 => 4;
 }
 
 /// Trait that implements slicing of a vector into a scalar or vector of lower dimensions, by

tests/compiletests/ui/arch/all.rs

@@ -1,36 +1,11 @@
 // build-pass
 
-#![feature(repr_simd)]
-
 use core::num::NonZeroUsize;
 use spirv_std::spirv;
 use spirv_std::{scalar::Scalar, vector::Vector, vector::VectorOrScalar};
 
-/// HACK(shesp). Rust doesn't allow us to declare regular (tuple-)structs containing `bool` members
-/// as `#[repl(simd)]`. But we need this for `spirv_std::arch::any()` and `spirv_std::arch::all()`
-/// to work.
-/// Fortunately, this requirement isn't checked on generic structs, so we have a way to work around
-/// it (for now at least)
-#[repr(simd)]
-#[derive(Copy, Clone, Debug)]
-struct Vec2<T>(T, T);
-unsafe impl<T: Scalar> VectorOrScalar for Vec2<T> {
-    type Scalar = T;
-    const DIM: NonZeroUsize = match NonZeroUsize::new(2) {
-        None => panic!(),
-        Some(n) => n,
-    };
-}
-unsafe impl<T: Scalar> Vector<T, 2> for Vec2<T> {}
-
-impl<T: Scalar> Default for Vec2<T> {
-    fn default() -> Vec2<T> {
-        Vec2(T::default(), T::default())
-    }
-}
-
 #[spirv(fragment)]
 pub fn main() {
-    let vector = Vec2(true, true);
+    let vector = glam::BVec2::new(true, true);
     assert!(spirv_std::arch::all(vector));
 }

tests/compiletests/ui/arch/all.stderr

@@ -1,36 +1,11 @@
 // build-pass
 
-#![feature(repr_simd)]
-
 use core::num::NonZeroUsize;
 use spirv_std::spirv;
 use spirv_std::{scalar::Scalar, vector::Vector, vector::VectorOrScalar};
 
-/// HACK(shesp). Rust doesn't allow us to declare regular (tuple-)structs containing `bool` members
-/// as `#[repl(simd)]`. But we need this for `spirv_std::arch::any()` and `spirv_std::arch::all()`
-/// to work.
-/// Fortunately, this requirement isn't checked on generic structs, so we have a way to work around
-/// it (for now at least)
-#[repr(simd)]
-#[derive(Copy, Clone, Debug)]
-struct Vec2<T>(T, T);
-unsafe impl<T: Scalar> VectorOrScalar for Vec2<T> {
-    type Scalar = T;
-    const DIM: NonZeroUsize = match NonZeroUsize::new(2) {
-        None => panic!(),
-        Some(n) => n,
-    };
-}
-unsafe impl<T: Scalar> Vector<T, 2> for Vec2<T> {}
-
-impl<T: Scalar> Default for Vec2<T> {
-    fn default() -> Vec2<T> {
-        Vec2(T::default(), T::default())
-    }
-}
-
 #[spirv(fragment)]
 pub fn main() {
-    let vector = Vec2(false, true);
+    let vector = glam::BVec2::new(false, true);
     assert!(spirv_std::arch::any(vector));
 }

tests/compiletests/ui/arch/any.rs

@@ -121,15 +121,15 @@ error[E0277]: the trait bound `{float}: Vector<f32, 2>` is not satisfied
     |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Vector<f32, 2>` is not implemented for `{float}`
     |
     = help: the following other types implement trait `Vector<T, N>`:
+              `BVec2` implements `Vector<bool, 2>`
+              `BVec3` implements `Vector<bool, 3>`
+              `BVec4` implements `Vector<bool, 4>`
               `DVec2` implements `Vector<f64, 2>`
               `DVec3` implements `Vector<f64, 3>`
               `DVec4` implements `Vector<f64, 4>`
               `IVec2` implements `Vector<i32, 2>`
               `IVec3` implements `Vector<i32, 3>`
-              `IVec4` implements `Vector<i32, 4>`
-              `UVec2` implements `Vector<u32, 2>`
-              `UVec3` implements `Vector<u32, 3>`
-            and 5 others
+            and 8 others
 note: required by a bound in `debug_printf_assert_is_vector`
    --> $SPIRV_STD_SRC/lib.rs:141:8
     |