[Mesa-dev] [PATCH 2/2] nir: fix typo for f2b/i2b/b2i expressions (v2)

[Connor Abbott]

Wow, that's pretty embarrassing... it's tough to test this code, so
I'm not too surprised it's this busted.

Reviewed-by: Connor Abbott <cwabbott0 at gmail.com>

On Thu, Apr 2, 2015 at 2:35 PM, Rob Clark <robdclark at gmail.com> wrote:
> From: Rob Clark <robclark at freedesktop.org>
>
> v2: discovered that i2b/b2i are also confused
>
> Signed-off-by: Rob Clark <robclark at freedesktop.org>
> ---
>  src/glsl/nir/nir_opcodes.py | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/glsl/nir/nir_opcodes.py b/src/glsl/nir/nir_opcodes.py
> index 062cd62..f96424f 100644
> --- a/src/glsl/nir/nir_opcodes.py
> +++ b/src/glsl/nir/nir_opcodes.py
> @@ -161,12 +161,12 @@ unop_convert("f2i", tfloat, tint, "src0") # Float-to-integer conversion.
>  unop_convert("f2u", tfloat, tunsigned, "src0") # Float-to-unsigned conversion
>  unop_convert("i2f", tint, tfloat, "src0") # Integer-to-float conversion.
>  # Float-to-boolean conversion
> -unop_convert("f2b", tfloat, tbool, "src0 == 0.0f")
> +unop_convert("f2b", tfloat, tbool, "src0 != 0.0f")
>  # Boolean-to-float conversion
>  unop_convert("b2f", tbool, tfloat, "src0 ? 1.0f : 0.0f")
>  # Int-to-boolean conversion
> -unop_convert("i2b", tint, tbool, "src0 == 0")
> -unop_convert("b2i", tbool, tint, "src0 ? 0 : -1") # Boolean-to-int conversion
> +unop_convert("i2b", tint, tbool, "src0 != 0")
> +unop_convert("b2i", tbool, tint, "src0 ? 1 : 0") # Boolean-to-int conversion
>  unop_convert("u2f", tunsigned, tfloat, "src0") #Unsigned-to-float conversion.
>
>  unop_reduce("bany", 1, tbool, tbool, "{src}", "{src0} || {src1}", "{src}")
> --
> 2.1.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev