From edf2f7ca31d8b4b2ec61894e70ef08b6b7085142 Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Sun, 2 May 2021 21:41:09 -0400 Subject: [PATCH] Fix struct layouts for WGSL and SPIRV --- src/front/spv/mod.rs | 48 ++++++++++++++++++++++++++++--------------- src/front/wgsl/mod.rs | 5 ++++- tests/out/skybox.msl | 2 +- 3 files changed, 36 insertions(+), 19 deletions(-) diff --git a/src/front/spv/mod.rs b/src/front/spv/mod.rs index 33113e055..4155477a9 100644 --- a/src/front/spv/mod.rs +++ b/src/front/spv/mod.rs @@ -191,6 +191,28 @@ impl crate::ImageDimension { } } +//TODO: should this be shared with `crate::proc::wgsl::layout` logic? +fn get_alignment(ty: Handle, arena: &Arena) -> crate::Alignment { + use crate::TypeInner as Ti; + match arena[ty].inner { + Ti::Scalar { width, .. } => crate::Alignment::new(width as u32).unwrap(), + Ti::Vector { size, width, .. } + | Ti::Matrix { + rows: size, width, .. + } => { + let count = if size >= crate::VectorSize::Tri { 4 } else { 2 }; + crate::Alignment::new((count * width) as u32).unwrap() + } + Ti::Pointer { .. } | Ti::ValuePointer { .. } => crate::Alignment::new(1).unwrap(), + Ti::Array { stride, .. } => crate::Alignment::new(stride).unwrap(), + Ti::Struct { ref level, .. } => match *level { + crate::StructLevel::Root => crate::Alignment::new(1).unwrap(), + crate::StructLevel::Normal { alignment } => alignment, + }, + Ti::Image { .. } | Ti::Sampler { .. } => crate::Alignment::new(1).unwrap(), + } +} + type MemberIndex = u32; #[derive(Clone, Debug, Default, PartialEq)] @@ -2790,6 +2812,7 @@ impl> Parser { let parent_decor = self.future_decor.remove(&id); let block_decor = parent_decor.as_ref().and_then(|decor| decor.block.clone()); + let mut struct_alignment = crate::Alignment::new(1).unwrap(); let mut members = Vec::::with_capacity(inst.wc as usize - 2); let mut member_lookups = Vec::with_capacity(members.capacity()); for i in 0..u32::from(inst.wc) - 2 { @@ -2806,17 +2829,8 @@ impl> Parser { }); let binding = decor.io_binding().ok(); - let offset = match decor.offset { - Some(offset) => offset, - None => match members.last() { - Some(member) => { - //TODO: is this needed? - // If offsets are required, we can just put 0 here - member.offset + module.types[member.ty].inner.span(&module.constants) - } - None => 0, - }, - }; + // I/O structs don't have to have offsets, others do + let offset = decor.offset.unwrap_or(0); if let crate::TypeInner::Matrix { columns: _, @@ -2831,6 +2845,9 @@ impl> Parser { } } + let alignment = get_alignment(ty, &module.types); + struct_alignment = struct_alignment.max(alignment); + members.push(crate::StructMember { name: decor.name, ty, @@ -2839,22 +2856,19 @@ impl> Parser { }); } - //TODO: we should be able to do better than this. - const STRUCT_ALIGNMENT: u32 = 16; - let inner = crate::TypeInner::Struct { level: match block_decor { Some(_) => crate::StructLevel::Root, None => crate::StructLevel::Normal { - alignment: crate::Alignment::new(STRUCT_ALIGNMENT).unwrap(), + alignment: struct_alignment, }, }, span: match members.last() { Some(member) => { let end = member.offset + module.types[member.ty].inner.span(&module.constants); - ((end - 1) | (STRUCT_ALIGNMENT - 1)) + 1 + ((end - 1) | (struct_alignment.get() - 1)) + 1 } - None => STRUCT_ALIGNMENT, + None => 4, //do we support this? }, members, }; diff --git a/src/front/wgsl/mod.rs b/src/front/wgsl/mod.rs index d2ac7a0b1..67e666ffb 100644 --- a/src/front/wgsl/mod.rs +++ b/src/front/wgsl/mod.rs @@ -1605,7 +1605,10 @@ impl Parser { let name = match lexer.next() { (Token::Word(word), _) => word, - (Token::Paren('}'), _) => return Ok((members, offset, alignment)), + (Token::Paren('}'), _) => { + let span = layout::Layouter::round_up(alignment, offset); + return Ok((members, span, alignment)); + } other => return Err(Error::Unexpected(other, "field name")), }; lexer.expect(Token::Separator(':'))?; diff --git a/tests/out/skybox.msl b/tests/out/skybox.msl index 6b5409773..c3ba81213 100644 --- a/tests/out/skybox.msl +++ b/tests/out/skybox.msl @@ -3,7 +3,7 @@ struct VertexOutput { metal::float4 position; - packed_float3 uv; + metal::float3 uv; }; struct Data { metal::float4x4 proj_inv;