fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 03:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nak: replace !foo.is_{none,some}() with their positive counterpart

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38807>
This commit is contained in:
Eric Engestrom 2025-10-04 15:17:15 +02:00
parent ca319ba707
commit 49b2597854
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -551,7 +551,7 @@ impl TexQueueSimulationState {
// If the flush needs a barrier, the queue will not be full, // If the flush needs a barrier, the queue will not be full,
// therefore the push will not need a barrier. // therefore the push will not need a barrier.
debug_assert!(!flush_level.is_some() || !push_level.is_some()); debug_assert!(flush_level.is_none() || push_level.is_none());
flush_level.or(push_level) flush_level.or(push_level)
} }
} }

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

@ -2889,14 +2889,14 @@ impl<'a> ShaderFromNir<'a> {
}; };
for i in 0..32 { for i in 0..32 {
if !self.fs_out_regs[i].is_none() { if self.fs_out_regs[i].is_some() {
info.writes_color |= 1 << i; info.writes_color |= 1 << i;
} }
} }
let mask_idx = (NAK_FS_OUT_SAMPLE_MASK / 4) as usize; let mask_idx = (NAK_FS_OUT_SAMPLE_MASK / 4) as usize;
info.writes_sample_mask = !self.fs_out_regs[mask_idx].is_none(); info.writes_sample_mask = self.fs_out_regs[mask_idx].is_some();
let depth_idx = (NAK_FS_OUT_DEPTH / 4) as usize; let depth_idx = (NAK_FS_OUT_DEPTH / 4) as usize;
info.writes_depth = !self.fs_out_regs[depth_idx].is_none(); info.writes_depth = self.fs_out_regs[depth_idx].is_some();
let mut srcs = Vec::new(); let mut srcs = Vec::new();
for i in 0..8 { for i in 0..8 {