nak: use Option propagation instead of explicit let-else clauses
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34372>
This commit is contained in:
@@ -307,9 +307,7 @@ impl RegAllocator {
|
||||
}
|
||||
|
||||
pub fn try_get_vec_reg(&self, vec: &SSARef) -> Option<u32> {
|
||||
let Some(reg) = self.try_get_reg(vec[0]) else {
|
||||
return None;
|
||||
};
|
||||
let reg = self.try_get_reg(vec[0])?;
|
||||
|
||||
let align = u32::from(vec.comps()).next_power_of_two();
|
||||
if reg % align != 0 {
|
||||
|
||||
@@ -4627,17 +4627,12 @@ impl OpPrmt {
|
||||
}
|
||||
|
||||
pub fn as_u32(&self) -> Option<u32> {
|
||||
let Some(sel) = self.get_sel() else {
|
||||
return None;
|
||||
};
|
||||
let sel = self.get_sel()?;
|
||||
|
||||
let mut imm = 0_u32;
|
||||
for b in 0..4 {
|
||||
let sel_byte = sel.get(b);
|
||||
let sel_src = &self.srcs[sel_byte.src()];
|
||||
let Some(src_u32) = sel_src.as_u32(SrcType::ALU) else {
|
||||
return None;
|
||||
};
|
||||
let src_u32 = self.srcs[sel_byte.src()].as_u32(SrcType::ALU)?;
|
||||
|
||||
let sb = sel_byte.fold_u32(src_u32);
|
||||
imm |= u32::from(sb) << (b * 8);
|
||||
|
||||
Reference in New Issue
Block a user