[Mesa-dev] [PATCH 03/12] nir: fix constant folding of bfi

[Edward O'Callaghan]

Reviewed-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>


-- 
  Edward O'Callaghan
  edward.ocallaghan at koparo.com

On Sat, Aug 15, 2015, at 08:30 AM, Connor Abbott wrote:
> Signed-off-by: Connor Abbott <connor.w.abbott at intel.com>
> ---
>  src/glsl/nir/nir_opcodes.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/glsl/nir/nir_opcodes.py b/src/glsl/nir/nir_opcodes.py
> index df5b7e2..77c766b 100644
> --- a/src/glsl/nir/nir_opcodes.py
> +++ b/src/glsl/nir/nir_opcodes.py
> @@ -510,7 +510,7 @@ opcode("bcsel", 0, tunsigned, [0, 0, 0],
>        [tbool, tunsigned, tunsigned], "", "src0 ? src1 : src2")
>  
>  triop("bfi", tunsigned, """
> -unsigned mask = src0, insert = src1 & mask, base = src2;
> +unsigned mask = src0, insert = src1, base = src2;
>  if (mask == 0) {
>     dst = base;
>  } else {
> @@ -519,7 +519,7 @@ if (mask == 0) {
>        tmp >>= 1;
>        insert <<= 1;
>     }
> -   dst = (base & ~mask) | insert;
> +   dst = (base & ~mask) | (insert & mask);
>  }
>  """)
>  
> -- 
> 2.4.3
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev