fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-02 19:40:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

nir/lower_tex: Copy more fields in lower_tex_to_txd and friends

Browse source 
Fixes NIR validation errors for OpenMW on Panfrost.

Fixes: 1f97819fbe ("panfrost: Emulate GL_CLAMP on Bifrost")
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15939>
(cherry picked from commit ad864a7c15)
This commit is contained in:
Icecream95 2022-04-14 13:30:39 +12:00 • committed by Dylan Baker
parent a068671262
commit f5707aae3c
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -2245,7 +2245,7 @@
"description": "nir/lower_tex: Copy more fields in lower_tex_to_txd and friends",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "1f97819fbe56a388878a23f49c0cf47016e4dde0"
},

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

@ -767,6 +767,9 @@ lower_tex_to_txd(nir_builder *b, nir_tex_instr *tex)
txd->coord_components = tex->coord_components;
txd->texture_index = tex->texture_index;
txd->sampler_index = tex->sampler_index;
txd->is_array = tex->is_array;
txd->is_shadow = tex->is_shadow;
txd->is_new_style_shadow = tex->is_new_style_shadow;
/* reuse existing srcs */
for (unsigned i = 0; i < tex->num_srcs; i++) {
@ -803,6 +806,9 @@ lower_txb_to_txl(nir_builder *b, nir_tex_instr *tex)
txl->coord_components = tex->coord_components;
txl->texture_index = tex->texture_index;
txl->sampler_index = tex->sampler_index;
txl->is_array = tex->is_array;
txl->is_shadow = tex->is_shadow;
txl->is_new_style_shadow = tex->is_new_style_shadow;
/* reuse all but bias src */
for (int i = 0; i < 2; i++) {