KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nir: Fix idiv lowering on !NativeIntegers when lower_fdiv is also set. 

Avoids a regression when turning off GLSL's int div lowering.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16823>
This commit is contained in:
Emma Anholt 2022-06-06 11:30:51 -07:00 committed by Marge Bot
parent 464b32c030
commit 5c499d6d1a
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/compiler/nir/nir_lower_int_to_float.c
View File

@ -101,11 +101,20 @@ lower_alu_instr(nir_builder *b, nir_alu_instr *alu)
case nir_op_iadd: alu->op = nir_op_fadd; break;
case nir_op_isub: alu->op = nir_op_fsub; break;
case nir_op_imul: alu->op = nir_op_fmul; break;
case nir_op_idiv:
rep = nir_ftrunc(b, nir_fdiv(b,
nir_ssa_for_alu_src(b, alu, 0),
nir_ssa_for_alu_src(b, alu, 1)));
case nir_op_idiv: {
nir_ssa_def *x = nir_ssa_for_alu_src(b, alu, 0);
nir_ssa_def *y = nir_ssa_for_alu_src(b, alu, 1);
/* Hand-lower fdiv, since lower_int_to_float is after nir_opt_algebraic. */
if (b->shader->options->lower_fdiv) {
rep = nir_ftrunc(b, nir_fmul(b, x, nir_frcp(b, y)));
} else {
rep = nir_ftrunc(b, nir_fdiv(b, x, y));
}
break;
}
case nir_op_iabs: alu->op = nir_op_fabs; break;
case nir_op_ineg: alu->op = nir_op_fneg; break;
case nir_op_imax: alu->op = nir_op_fmax; break;