Fix layout roundup

bin/convert.rs

@@ -185,6 +185,7 @@ fn main() {
         Some(ref string) => string,
         None => {
             println!("{:#?}", module);
+            println!("{:#?}", info);
             return;
         }
     };

src/proc/layouter.rs

@@ -30,7 +30,7 @@ impl Layouter {
     }
 
     pub fn round_up(alignment: NonZeroU32, offset: u32) -> u32 {
-        match offset & alignment.get() {
+        match offset & (alignment.get() - 1) {
             0 => offset,
             other => offset + alignment.get() - other,
         }

src/valid/analyzer.rs

@@ -134,7 +134,7 @@ pub struct SamplingKey {
     pub sampler: Handle<crate::GlobalVariable>,
 }
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 #[cfg_attr(feature = "serialize", derive(serde::Serialize))]
 #[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
 pub struct ExpressionInfo {
@@ -159,6 +159,7 @@ impl ExpressionInfo {
     }
 }
 
+#[derive(Debug)]
 #[cfg_attr(feature = "serialize", derive(serde::Serialize))]
 #[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
 pub struct FunctionInfo {

src/valid/mod.rs

@@ -48,6 +48,7 @@ bitflags::bitflags! {
     }
 }
 
+#[derive(Debug)]
 #[cfg_attr(feature = "serialize", derive(serde::Serialize))]
 #[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
 pub struct ModuleInfo {

tests/out/quad.spvasm.snap

@@ -30,7 +30,7 @@ OpName %44 "uv"
 OpName %47 "main"
 OpName %47 "main"
 OpMemberDecorate %9 0 Offset 0
-OpMemberDecorate %9 1 Offset 8
+OpMemberDecorate %9 1 Offset 16
 OpDecorate %12 DescriptorSet 0
 OpDecorate %12 Binding 0
 OpDecorate %14 DescriptorSet 0

tests/out/shadow.info.ron.snap

@@ -2956,7 +2956,7 @@ expression: output
                 alignment: 96,
             ),
             (
-                size: 96,
+                size: 128,
                 alignment: 96,
             ),
             (