From 4cda61f11e922fb5914ae73d22cc0c495abf0377 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Mon, 13 Jan 2020 11:34:53 -0800 Subject: [PATCH] nir: assert that nir_lower_tex runs after lowering derefs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It isn't going to do the right thing, because texture_index/ sampler_index defaults to zero. Signed-off-by: Rob Clark Reviewed-by: Marek Olšák Part-of: --- src/compiler/nir/nir_lower_tex.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/compiler/nir/nir_lower_tex.c b/src/compiler/nir/nir_lower_tex.c index 6c8c6aa1164..191076f8c27 100644 --- a/src/compiler/nir/nir_lower_tex.c +++ b/src/compiler/nir/nir_lower_tex.c @@ -934,6 +934,12 @@ nir_lower_tex_block(nir_block *block, nir_builder *b, nir_tex_instr *tex = nir_instr_as_tex(instr); bool lower_txp = !!(options->lower_txp & (1 << tex->sampler_dim)); + /* we aren't really going to do the right thing if we haven't + * lowered tex/samp derefs yet: + */ + assume(nir_tex_instr_src_index(tex, nir_tex_src_texture_deref) < 0); + assume(nir_tex_instr_src_index(tex, nir_tex_src_sampler_deref) < 0); + /* mask of src coords to saturate (clamp): */ unsigned sat_mask = 0; -- 2.30.2