[Mesa-dev] [PATCH] nir/glsl: Fix copy-n-paste mistakes from commit 213f864.

Connor Abbott cwabbott0 at gmail.com
Sat Nov 14 18:06:51 PST 2015


Whoops.

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

On Sat, Nov 14, 2015 at 8:49 PM, Matt Turner <mattst88 at gmail.com> wrote:
> ---
>  src/glsl/nir/glsl_to_nir.cpp | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/glsl/nir/glsl_to_nir.cpp b/src/glsl/nir/glsl_to_nir.cpp
> index b10d192..62eedbf 100644
> --- a/src/glsl/nir/glsl_to_nir.cpp
> +++ b/src/glsl/nir/glsl_to_nir.cpp
> @@ -1538,9 +1538,9 @@ nir_visitor::visit(ir_expression *ir)
>        result = supports_ints ? nir_ior(&b, srcs[0], srcs[1])
>                               : nir_for(&b, srcs[0], srcs[1]);
>        break;
> -   case ir_binop_logic_xor: result = nir_ixor(&b, srcs[0], srcs[1]); break;
> -      result = supports_ints ? nir_ior(&b, srcs[0], srcs[1])
> -                             : nir_for(&b, srcs[0], srcs[1]);
> +   case ir_binop_logic_xor:
> +      result = supports_ints ? nir_ixor(&b, srcs[0], srcs[1])
> +                             : nir_fxor(&b, srcs[0], srcs[1]);
>        break;
>     case ir_binop_lshift: result = nir_ishl(&b, srcs[0], srcs[1]); break;
>     case ir_binop_rshift:
> --
> 2.4.9
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list