Module: Mesa Branch: main Commit: bda208665f993519ff6034d2e180f09332ab44d2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bda208665f993519ff6034d2e180f09332ab44d2
Author: Faith Ekstrand <[email protected]> Date: Thu Nov 23 21:38:42 2023 -0600 nak: Handle non-DW-aligned UBO loads Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26348> --- src/nouveau/compiler/nak_from_nir.rs | 21 ++++++++++++++++++--- src/nouveau/compiler/nak_ir.rs | 5 +++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/nouveau/compiler/nak_from_nir.rs b/src/nouveau/compiler/nak_from_nir.rs index 71ef1f30be3..a19e248754e 100644 --- a/src/nouveau/compiler/nak_from_nir.rs +++ b/src/nouveau/compiler/nak_from_nir.rs @@ -2010,9 +2010,24 @@ impl<'a> ShaderFromNir<'a> { offset: off_imm.try_into().unwrap(), }; if off.is_zero() { - for (i, comp) in dst.iter().enumerate() { - let i = u16::try_from(i).unwrap(); - b.copy_to((*comp).into(), cb.offset(i * 4).into()); + if off_imm % 4 == 0 { + for (i, comp) in dst.iter().enumerate() { + let i = i16::try_from(i).unwrap(); + b.copy_to( + (*comp).into(), + cb.offset(i * 4).into(), + ); + } + } else { + let delta: u8 = (off_imm % 4).try_into().unwrap(); + let aligned_cb = cb.offset(-i16::from(delta)); + let tmp = b.copy(aligned_cb.into()); + let prmt = match size_B { + 1 => [delta, 4, 4, 4], + 2 => [delta, delta + 1, 4, 4], + _ => panic!("Invalid load_ubo"), + }; + b.prmt_to(dst.into(), tmp.into(), 0.into(), prmt); } } else { b.push_op(OpLdc { diff --git a/src/nouveau/compiler/nak_ir.rs b/src/nouveau/compiler/nak_ir.rs index 89bcaac929a..3533f65461f 100644 --- a/src/nouveau/compiler/nak_ir.rs +++ b/src/nouveau/compiler/nak_ir.rs @@ -742,10 +742,11 @@ pub struct CBufRef { } impl CBufRef { - pub fn offset(self, offset: u16) -> CBufRef { + pub fn offset(self, offset: i16) -> CBufRef { CBufRef { buf: self.buf, - offset: self.offset + offset, + offset: (i32::from(self.offset) + + i32::from(offset)).try_into().unwrap(), } } }
