From 71572ebb32e5a460e5039fb27903f60b3b89e037 Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Tue, 4 Aug 2020 11:18:46 +0200 Subject: [PATCH] nir/lower_tex: skip lower_tex_packing for the texture samples query MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Similar to other skips for texture queries that don't actually sample the texture and which results are not packed. We can't use nir_tex_instr_is_query() here to skip the lowering for all queries since that causes regressions in Piglit. Apparently, we do want to lower some of the query results. In particularly, the LOD query. Reviewed-by: Alejandro Piñeiro Part-of: --- src/compiler/nir/nir_lower_tex.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/compiler/nir/nir_lower_tex.c b/src/compiler/nir/nir_lower_tex.c index 2e68f2b164e..0d23cde0c28 100644 --- a/src/compiler/nir/nir_lower_tex.c +++ b/src/compiler/nir/nir_lower_tex.c @@ -1086,7 +1086,8 @@ nir_lower_tex_block(nir_block *block, nir_builder *b, if (options->lower_tex_packing[tex->sampler_index] != nir_lower_tex_packing_none && tex->op != nir_texop_txs && - tex->op != nir_texop_query_levels) { + tex->op != nir_texop_query_levels && + tex->op != nir_texop_texture_samples) { lower_tex_packing(b, tex, options); progress = true; } -- 2.30.2