diff options
| author | Timothy Arceri <[email protected]> | 2018-02-28 14:33:55 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2018-02-28 15:55:39 +1100 |
| commit | 0c1f37cc2d8555223ade73b244a3ee374be8d9cd (patch) | |
| tree | dcd01aa3f2f4be481d9ce66428fe812754798555 /src/compiler | |
| parent | 086c88551d286cf29a2414227fc3a6f4b0c9c455 (diff) | |
nir: fix interger divide by zero crash during constant folding
From the GLSL 4.60 spec Section 5.9 (Expressions):
"Dividing by zero does not cause an exception but does result in
an unspecified value."
Fixes: 89285e4d47a6 "nir: add new constant folding infrastructure"
Reviewed-by: Jason Ekstrand <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105271
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/nir/nir_opcodes.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/nir/nir_opcodes.py b/src/compiler/nir/nir_opcodes.py index 278562b2bd1..97da4db28f1 100644 --- a/src/compiler/nir/nir_opcodes.py +++ b/src/compiler/nir/nir_opcodes.py @@ -404,8 +404,8 @@ binop("umul_high", tuint32, commutative, "(uint32_t)(((uint64_t) src0 * (uint64_t) src1) >> 32)") binop("fdiv", tfloat, "", "src0 / src1") -binop("idiv", tint, "", "src0 / src1") -binop("udiv", tuint, "", "src0 / src1") +binop("idiv", tint, "", "src1 == 0 ? 0 : (src0 / src1)") +binop("udiv", tuint, "", "src1 == 0 ? 0 : (src0 / src1)") # returns a boolean representing the carry resulting from the addition of # the two unsigned arguments. |