Module: Mesa Branch: main Commit: 6881ff4c9923ca1599516c3038f31fb97ec38d6a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6881ff4c9923ca1599516c3038f31fb97ec38d6a
Author: Faith Ekstrand <faith.ekstr...@collabora.com> Date: Wed Dec 6 18:53:27 2023 -0600 nak: Drop the fmnmx from Builder Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26557> --- src/nouveau/compiler/nak/builder.rs | 10 ---------- src/nouveau/compiler/nak/from_nir.rs | 14 ++++++++------ 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/nouveau/compiler/nak/builder.rs b/src/nouveau/compiler/nak/builder.rs index 8f5b9f1fca3..5a49b7dcd95 100644 --- a/src/nouveau/compiler/nak/builder.rs +++ b/src/nouveau/compiler/nak/builder.rs @@ -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 { diff --git a/src/nouveau/compiler/nak/from_nir.rs b/src/nouveau/compiler/nak/from_nir.rs index 069760569cd..16b81886d0a 100644 --- a/src/nouveau/compiler/nak/from_nir.rs +++ b/src/nouveau/compiler/nak/from_nir.rs @@ -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);
