[Mesa-dev] [PATCH] nir: Fix logic error.

[Jason Ekstrand]

Sorry I didn't get to this earlier.  It got lost in the backlog.

Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>

Out of curiosity, are there any shader-db results for this?  If not, that's
ok.

--Jason

On Wed, Feb 4, 2015 at 3:19 PM, Matt Turner <mattst88 at gmail.com> wrote:

> ---
> I don't know if this is right, but what we had before was definitely
> wrong. (And gcc warned about it!)
>
>  src/glsl/nir/nir_lower_phis_to_scalar.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/glsl/nir/nir_lower_phis_to_scalar.c
> b/src/glsl/nir/nir_lower_phis_to_scalar.c
> index 3bb5cc7..7c2f539 100644
> --- a/src/glsl/nir/nir_lower_phis_to_scalar.c
> +++ b/src/glsl/nir/nir_lower_phis_to_scalar.c
> @@ -65,9 +65,9 @@ is_phi_src_scalarizable(nir_phi_src *src,
>         * are ok too.
>         */
>        return nir_op_infos[src_alu->op].output_size == 0 ||
> -             src_alu->op != nir_op_vec2 ||
> -             src_alu->op != nir_op_vec3 ||
> -             src_alu->op != nir_op_vec4;
> +             (src_alu->op != nir_op_vec2 &&
> +              src_alu->op != nir_op_vec3 &&
> +              src_alu->op != nir_op_vec4);
>     }
>
>     case nir_instr_type_phi:
> --
> 2.0.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20150209/37d4c749/attachment.html>