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

nak: Don't allow r255 in texture or surface ops

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24998>
This commit is contained in:
Faith Ekstrand 2023-04-22 18:23:03 -05:00 • committed by Marge Bot
parent b70d998180
commit a6e1167a83
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/nouveau/compiler/nak_legalize.rs
View file

@ -66,6 +66,12 @@ impl<'a> LegalizeInstr<'a> {
}
}
pub fn mov_src_if_not_ssa(&mut self, src: &mut Src, file: RegFile) {
if src.as_ssa().is_none() {
self.mov_src(src, file);
}
}
pub fn swap_srcs_if_not_reg(&mut self, x: &mut Src, y: &mut Src) {
if !src_is_reg(x) && src_is_reg(y) {
std::mem::swap(x, y);
@ -188,20 +194,21 @@ impl<'a> LegalizeInstr<'a> {
Op::St(op) => {
self.mov_src_if_not_reg(&mut op.data, RegFile::GPR);
}
Op::ALd(_)
| Op::ASt(_)
| Op::Tex(_)
Op::ALd(_) | Op::ASt(_) | Op::Ld(_) | Op::St(_) => {
for src in instr.srcs_mut() {
self.mov_src_if_not_reg(src, RegFile::GPR);
}
}
Op::Tex(_)
| Op::Tld(_)
| Op::Tld4(_)
| Op::Tmml(_)
| Op::Txd(_)
| Op::Txq(_)
| Op::SuLd(_)
| Op::SuSt(_)
| Op::Ld(_)
| Op::St(_) => {
| Op::SuSt(_) => {
for src in instr.srcs_mut() {
self.mov_src_if_not_reg(src, RegFile::GPR);
self.mov_src_if_not_ssa(src, RegFile::GPR);
}
}
_ => (),