fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 05:08:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nak: remove unnecessary casts and conversions

Browse source 
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34372>
This commit is contained in:
Seán de Búrca 2025-04-03 18:17:45 -07:00 • committed by Marge Bot
parent e4d895f0e1
commit 451b37820d
9 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/nouveau/compiler/nak/api.rs
View file

@ -314,8 +314,8 @@ impl ShaderBin {
writes_point_size: io.attr_written(NAK_ATTR_POINT_SIZE),
writes_vprs_table_index: io
.attr_written(NAK_ATTR_VPRS_TABLE_INDEX),
clip_enable: io.clip_enable.try_into().unwrap(),
cull_enable: io.cull_enable.try_into().unwrap(),
clip_enable: io.clip_enable,
cull_enable: io.cull_enable,
xfb: if let Some(xfb) = &io.xfb {
**xfb
} else {

4
src/nouveau/compiler/nak/assign_regs.rs
View file

@ -1186,7 +1186,7 @@ impl AssignRegsBlock {
for (_, src) in pcopy.dsts_srcs.iter_mut() {
if let Some(src_vec) = src_ssa_ref(src) {
debug_assert!(src_vec.comps() == 1);
let reg = self.get_scalar(src_vec[0]).into();
let reg = self.get_scalar(src_vec[0]);
src_set_reg(src, reg);
}
}
@ -1225,7 +1225,7 @@ impl AssignRegsBlock {
for src in out.srcs.iter_mut() {
if let Some(src_vec) = src_ssa_ref(src) {
debug_assert!(src_vec.comps() == 1);
let reg = self.get_scalar(src_vec[0]).into();
let reg = self.get_scalar(src_vec[0]);
src_set_reg(src, reg);
}
}

5
src/nouveau/compiler/nak/from_nir.rs
View file

@ -675,8 +675,7 @@ impl<'a> ShaderFromNir<'a> {
} else if *s != Src::from(dw) {
continue;
}
prmt[usize::from(b)] =
(ds as u8) * 4 + (bytes[b] % 4);
prmt[b] = (ds as u8) * 4 + (bytes[b] % 4);
break;
}
}
@ -2436,7 +2435,7 @@ impl<'a> ShaderFromNir<'a> {
b.push_op(OpBreak {
bar_out: bar_out.into(),
bar_in: bar_in.into(),
cond: cond.into(),
cond,
});
self.set_dst(&intrin.def, b.bmov_to_gpr(bar_out.into()).into());

4
src/nouveau/compiler/nak/ir.rs
View file

@ -3779,7 +3779,7 @@ impl Foldable for OpLea {
let (dst, o) = u32::overflowing_add(shift_result, b);
overflow |= o;
f.set_u32_dst(self, &self.dst, dst as u32);
f.set_u32_dst(self, &self.dst, dst);
f.set_pred_dst(self, &self.overflow, overflow);
}
}
@ -3858,7 +3858,7 @@ impl Foldable for OpLeaX {
let (dst, o) = u32::overflowing_add(dst, if carry { 1 } else { 0 });
overflow |= o;
f.set_u32_dst(self, &self.dst, dst as u32);
f.set_u32_dst(self, &self.dst, dst);
f.set_pred_dst(self, &self.overflow, overflow);
}
}

4
src/nouveau/compiler/nak/opt_copy_prop.rs
View file

@ -319,10 +319,10 @@ impl<'a> CopyPropPass<'a> {
combined[i] = prmt_byte.byte().try_into().unwrap();
}
let entry_src_idx = usize::from(entry_src_idx.unwrap());
let entry_src_idx = entry_src_idx.unwrap();
let entry_src = &entry.srcs[entry_src_idx];
if !cbuf_rule.allows_src(entry.bi, &entry_src) {
if !cbuf_rule.allows_src(entry.bi, entry_src) {
return;
}

10
src/nouveau/compiler/nak/qmd.rs
View file

@ -528,15 +528,15 @@ pub extern "C" fn nak_get_qmd_cbuf_desc_layout(
idx: u8,
) -> nak_qmd_cbuf_desc_layout {
if dev.cls_compute >= clcbc0::HOPPER_COMPUTE_A {
Qmd4_0::cbuf_desc_layout(idx.into())
Qmd4_0::cbuf_desc_layout(idx)
} else if dev.cls_compute >= clc6c0::AMPERE_COMPUTE_A {
Qmd3_0::cbuf_desc_layout(idx.into())
Qmd3_0::cbuf_desc_layout(idx)
} else if dev.cls_compute >= clc3c0::VOLTA_COMPUTE_A {
Qmd2_2::cbuf_desc_layout(idx.into())
Qmd2_2::cbuf_desc_layout(idx)
} else if dev.cls_compute >= clc0c0::PASCAL_COMPUTE_A {
Qmd2_1::cbuf_desc_layout(idx.into())
Qmd2_1::cbuf_desc_layout(idx)
} else if dev.cls_compute >= cla0c0::KEPLER_COMPUTE_A {
Qmd0_6::cbuf_desc_layout(idx.into())
Qmd0_6::cbuf_desc_layout(idx)
} else {
panic!("Unsupported shader model");
}

2
src/nouveau/compiler/nak/spill_values.rs
View file

@ -837,7 +837,7 @@ fn spill_values<S: Spill>(
assert!(spill.is_const(ssa));
instrs.push(spill.spill(*ssa));
}
*ssa = spill.get_spill(*ssa).into();
*ssa = spill.get_spill(*ssa);
}
});
} else if file == RegFile::UPred && !bb.uniform {

6
src/nouveau/nil/image.rs
View file

@ -271,7 +271,7 @@ impl Image {
extent_px: info.extent_px,
sample_layout,
num_levels: info.levels,
levels: [ImageLevel::default(); MAX_LEVELS as usize],
levels: [ImageLevel::default(); MAX_LEVELS],
array_stride_B: 0,
align_B,
size_B,
@ -352,7 +352,7 @@ impl Image {
extent_px: info.extent_px,
sample_layout,
num_levels: info.levels,
levels: [ImageLevel::default(); MAX_LEVELS as usize],
levels: [ImageLevel::default(); MAX_LEVELS],
array_stride_B: 0,
align_B: 0,
size_B: 0,
@ -632,7 +632,7 @@ impl Image {
size_B -= next_lvl_offset_in_bytes - lvl.offset_B;
}
let mut levels: [ImageLevel; MAX_LEVELS as usize] = Default::default();
let mut levels: [ImageLevel; MAX_LEVELS] = Default::default();
levels[0] = lvl;
*offset_in_bytes_out = lvl.offset_B;

6
src/nouveau/nil/tic.rs
View file

@ -273,8 +273,8 @@ fn nv9097_fill_tic(
nv9097_set_th_v2_0(&mut th, &view.format, view.swizzle);
// There's no base layer field in the texture header
let layer_address = base_address
+ u64::from(view.base_array_layer) * u64::from(image.array_stride_B);
let layer_address =
base_address + u64::from(view.base_array_layer) * image.array_stride_B;
th.set_field(cl9097::TEXHEADV2_OFFSET_LOWER, layer_address as u32);
th.set_field(cl9097::TEXHEADV2_OFFSET_UPPER, (layer_address >> 32) as u32);
@ -395,7 +395,7 @@ fn nvb097_fill_tic(
view.base_array_layer + view.array_len <= image.extent_px.array_len
);
layer_address +=
u64::from(view.base_array_layer) * u64::from(image.array_stride_B);
u64::from(view.base_array_layer) * image.array_stride_B;
}
if tiling.is_tiled() {