[Mesa-dev] [PATCH 40/50] nir: In split_var_copies_block, uint, int, and bool types cannot be matrices

[Jason Ekstrand]

Seems reasonable,
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

On Mon, Nov 28, 2016 at 7:25 PM, Ian Romanick <idr at freedesktop.org> wrote:

> From: Ian Romanick <ian.d.romanick at intel.com>
>
> Noticed while adding support for 64-bit integer types.
>
> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
> Reviewed-by: Connor Abbott <cwabbott0 at gmail.com>
> Cc: Jason Ekstrand <jason.ekstrand at intel.com>
> ---
>  src/compiler/nir/nir_split_var_copies.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/src/compiler/nir/nir_split_var_copies.c
> b/src/compiler/nir/nir_split_var_copies.c
> index f9ad49a..63a7611 100644
> --- a/src/compiler/nir/nir_split_var_copies.c
> +++ b/src/compiler/nir/nir_split_var_copies.c
> @@ -231,9 +231,6 @@ split_var_copies_block(nir_block *block, struct
> split_var_copies_state *state)
>           break;
>        case GLSL_TYPE_FLOAT:
>        case GLSL_TYPE_DOUBLE:
> -      case GLSL_TYPE_INT:
> -      case GLSL_TYPE_UINT:
> -      case GLSL_TYPE_BOOL:
>           if (glsl_type_is_matrix(src_tail->type)) {
>              split_var_copy_instr(intrinsic, dest_head, src_head,
>                                   dest_tail, src_tail, state);
> @@ -241,6 +238,11 @@ split_var_copies_block(nir_block *block, struct
> split_var_copies_state *state)
>              ralloc_steal(state->dead_ctx, instr);
>           }
>           break;
> +      case GLSL_TYPE_INT:
> +      case GLSL_TYPE_UINT:
> +      case GLSL_TYPE_BOOL:
> +         assert(!glsl_type_is_matrix(src_tail->type));
> +         break;
>        default:
>           unreachable("Invalid type");
>           break;
> --
> 2.7.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20161128/cb42a8b0/attachment.html>