fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 13:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir/lower_tex: fix rect queries with lower_rect set

Browse source 
queries still need the sampler_dim changed

Fixes: 682e14d3ea ("nir: lower_tex: Don't normalize coordinates for TXF with RECT")

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15895>
(cherry picked from commit 5b0634d735)
This commit is contained in:
Mike Blumenkrantz 2022-04-12 11:42:14 -04:00 • committed by Dylan Baker
parent 9a1ca294a8
commit 653b560413
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1813,7 +1813,7 @@
"description": "nir/lower_tex: fix rect queries with lower_rect set",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "682e14d3eaee8991ee08ea309cbf9a509b6e6b27"
},

7
src/compiler/nir/nir_lower_tex.c
View file

@ -1334,9 +1334,10 @@ nir_lower_tex_block(nir_block *block, nir_builder *b,
}
if ((tex->sampler_dim == GLSL_SAMPLER_DIM_RECT) && options->lower_rect &&
tex->op != nir_texop_txf && !nir_tex_instr_is_query(tex)) {
if (compiler_options->has_txs)
tex->op != nir_texop_txf) {
if (nir_tex_instr_is_query(tex))
tex->sampler_dim = GLSL_SAMPLER_DIM_2D;
else if (compiler_options->has_txs)
lower_rect(b, tex);
else
lower_rect_tex_scale(b, tex);