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

nak: Insert an OpNop after OpBar

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24998>
This commit is contained in:
Faith Ekstrand 2023-10-25 10:12:24 -05:00 • committed by Marge Bot
parent e111bfdb5c
commit 0177373e2d
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/nouveau/compiler/nak_from_nir.rs
View file

@ -1867,6 +1867,7 @@ impl<'a> ShaderFromNir<'a> {
SCOPE_WORKGROUP => {
if self.nir.info.stage() == MESA_SHADER_COMPUTE {
b.push_op(OpBar {}).deps.yld = true;
b.push_op(OpNop { label: None });
}
}
_ => panic!("Unhandled execution scope"),

2
src/nouveau/compiler/nak_ir.rs
View file

@ -4590,6 +4590,7 @@ impl Instr {
| Op::CCtl(_)
| Op::MemBar(_)
| Op::Kill(_)
| Op::Nop(_)
| Op::Break(_)
| Op::BSSy(_)
| Op::BSync(_)
@ -4601,7 +4602,6 @@ impl Instr {
| Op::Out(_)
| Op::OutFinal(_) => false,
Op::BMov(op) => !op.clear,
Op::Nop(op) => op.label.is_none(),
_ => true,
}
}