From 9b17d7caac76e1c2dd4579c198b2e32b762bb656 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 8 Apr 2020 15:11:57 -0500 Subject: [PATCH] nir: Add some sanity assertions in opt_large_constants We make some assumptions in opt_large_constants such as the size_align function returning the obvious sizes for vectors. Now that we've got the deref_size lying around, we may as well assert it's consistent with our assumptions. In particular, we now assert that it really claims booleans are 32-bit. If anyone's driver ever decides to be clever and change this, we'll now catch the breakage earlier. Reviewed-by: Eric Anholt Reviewed-by: Ian Romanick Part-of: --- src/compiler/nir/nir_opt_large_constants.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/compiler/nir/nir_opt_large_constants.c b/src/compiler/nir/nir_opt_large_constants.c index 7e293ba2c5e..7ed26f51127 100644 --- a/src/compiler/nir/nir_opt_large_constants.c +++ b/src/compiler/nir/nir_opt_large_constants.c @@ -92,9 +92,11 @@ build_constant_load(nir_builder *b, nir_deref_instr *deref, if (load->dest.ssa.bit_size < 8) { /* Booleans are special-cased to be 32-bit */ assert(glsl_type_is_boolean(deref->type)); + assert(deref_size == num_components * 4); load->dest.ssa.bit_size = 32; return nir_b2b1(b, &load->dest.ssa); } else { + assert(deref_size == num_components * bit_size / 8); return &load->dest.ssa; } } -- 2.30.2