From b87039499b07b23f964123e99c5447c1308eb873 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 7 Sep 2016 14:35:20 -0700 Subject: [PATCH] nir: In split_var_copies_block, uint, int, and bool types cannot be matrices Noticed while adding support for 64-bit integer types. Signed-off-by: Ian Romanick Reviewed-by: Connor Abbott Reviewed-by: Jason Ekstrand --- 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