nak: Drop the fmnmx from Builder

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26557>
This commit is contained in:
Faith Ekstrand 2023-12-06 18:53:27 -06:00 committed by Marge Bot
parent 00b2564163
commit 6881ff4c99
2 changed files with 8 additions and 16 deletions

View file

@ -181,16 +181,6 @@ pub trait SSABuilder: Builder {
dst
}
fn fmnmx(&mut self, x: Src, y: Src, min: Src) -> SSARef {
let dst = self.alloc_ssa(RegFile::GPR, 1);
self.push_op(OpFMnMx {
dst: dst.into(),
srcs: [x, y],
min: min,
});
dst
}
fn fmul(&mut self, x: Src, y: Src) -> SSARef {
let dst = self.alloc_ssa(RegFile::GPR, 1);
self.push_op(OpFMul {

View file

@ -607,13 +607,15 @@ impl<'a> ShaderFromNir<'a> {
assert!(alu.get_src(0).bit_size() == 32);
b.fsetp(FloatCmpOp::OrdLt, srcs[0], srcs[1])
}
nir_op_fmax => {
nir_op_fmax | nir_op_fmin => {
assert!(alu.def.bit_size() == 32);
b.fmnmx(srcs[0], srcs[1], false.into())
}
nir_op_fmin => {
assert!(alu.def.bit_size() == 32);
b.fmnmx(srcs[0], srcs[1], true.into())
let dst = b.alloc_ssa(RegFile::GPR, 1);
b.push_op(OpFMnMx {
dst: dst.into(),
srcs: [srcs[0], srcs[1]],
min: (alu.op == nir_op_fmin).into(),
});
dst
}
nir_op_fmul => {
assert!(alu.def.bit_size() == 32);