WIP vec3: adjust abi layout

Author: Firestar99

crates/rustc_codegen_spirv/src/abi.rs

@@ -164,7 +164,9 @@ pub(crate) fn provide(providers: &mut Providers) {
         }
     }
 
-    providers.layout_of = |tcx, key| {
+    providers.layout_of = |tcx: TyCtxt<'_>,
+                           key: ty::PseudoCanonicalInput<'_, Ty<'_>>|
+     -> Result<TyAndLayout<'_>, &'_ ty::layout::LayoutError<'_>> {
         // HACK(eddyb) to special-case any types at all, they must be normalized,
         // but when normalization would be needed, `layout_of`'s default provider
         // recurses (supposedly for caching reasons), i.e. its calls `layout_of`

crates/rustc_codegen_spirv/src/spirv_type.rs

@@ -280,9 +280,7 @@ impl SpirvType<'_> {
             Self::Bool => Size::from_bytes(1),
             Self::Integer(width, _) | Self::Float(width) => Size::from_bits(width),
             Self::Adt { size, .. } => size?,
-            Self::Vector { element, count } => {
-                cx.lookup_type(element).sizeof(cx)? * count.next_power_of_two() as u64
-            }
+            Self::Vector { element, count } => cx.lookup_type(element).sizeof(cx)? * count as u64,
             Self::Matrix { element, count } => cx.lookup_type(element).sizeof(cx)? * count as u64,
             Self::Array { element, count } => {
                 cx.lookup_type(element).sizeof(cx)?
@@ -311,14 +309,8 @@ impl SpirvType<'_> {
             Self::Bool => Align::from_bytes(1).unwrap(),
             Self::Integer(width, _) | Self::Float(width) => Align::from_bits(width as u64).unwrap(),
             Self::Adt { align, .. } => align,
-            // Vectors have size==align
-            Self::Vector { .. } => Align::from_bytes(
-                self.sizeof(cx)
-                    .expect("alignof: Vectors must be sized")
-                    .bytes(),
-            )
-            .expect("alignof: Vectors must have power-of-2 size"),
-            Self::Array { element, .. }
+            Self::Vector { element, .. }
+            | Self::Array { element, .. }
             | Self::RuntimeArray { element }
             | Self::Matrix { element, .. } => cx.lookup_type(element).alignof(cx),
             Self::Pointer { .. } => cx.tcx.data_layout.pointer_align.abi,