fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-09 04:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nir/lower_mediump: Fix metadata in all passes

Browse source 
Fixes: fb29cef8dd ("nir: add many passes that lower and optimize 16-bit input/outputs and samplers")
Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11732>
(cherry picked from commit 9b57a81815)
This commit is contained in:
Alyssa Rosenzweig 2021-07-06 12:55:23 -04:00 • committed by Eric Engestrom
parent 8f283666fa
commit 123710b230
2 changed files with 43 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -40,7 +40,7 @@
"description": "nir/lower_mediump: Fix metadata in all passes",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "fb29cef8ddabdd05aeddc5220017bb28a83bb19c"
},

48
src/compiler/nir/nir_lower_mediump.c
View file

@ -121,7 +121,13 @@ nir_recompute_io_bases(nir_function_impl *impl, nir_variable_mode modes)
}
}
nir_metadata_preserve(impl, nir_metadata_all);
if (changed) {
nir_metadata_preserve(impl, nir_metadata_dominance |
nir_metadata_block_index);
} else {
nir_metadata_preserve(impl, nir_metadata_all);
}
return changed;
}
@ -227,7 +233,13 @@ nir_lower_mediump_io(nir_shader *nir, nir_variable_mode modes,
if (changed && use_16bit_slots)
nir_recompute_io_bases(impl, modes);
nir_metadata_preserve(impl, nir_metadata_all);
if (changed) {
nir_metadata_preserve(impl, nir_metadata_dominance |
nir_metadata_block_index);
} else {
nir_metadata_preserve(impl, nir_metadata_all);
}
return changed;
}
@ -286,7 +298,13 @@ nir_force_mediump_io(nir_shader *nir, nir_variable_mode modes,
}
}
nir_metadata_preserve(impl, nir_metadata_all);
if (changed) {
nir_metadata_preserve(impl, nir_metadata_dominance |
nir_metadata_block_index);
} else {
nir_metadata_preserve(impl, nir_metadata_all);
}
return changed;
}
@ -326,7 +344,13 @@ nir_unpack_16bit_varying_slots(nir_shader *nir, nir_variable_mode modes)
if (changed)
nir_recompute_io_bases(impl, modes);
nir_metadata_preserve(impl, nir_metadata_all);
if (changed) {
nir_metadata_preserve(impl, nir_metadata_dominance |
nir_metadata_block_index);
} else {
nir_metadata_preserve(impl, nir_metadata_all);
}
return changed;
}
@ -515,7 +539,13 @@ nir_fold_16bit_sampler_conversions(nir_shader *nir,
}
}
nir_metadata_preserve(impl, nir_metadata_all);
if (changed) {
nir_metadata_preserve(impl, nir_metadata_dominance |
nir_metadata_block_index);
} else {
nir_metadata_preserve(impl, nir_metadata_all);
}
return changed;
}
@ -606,6 +636,12 @@ nir_legalize_16bit_sampler_srcs(nir_shader *nir,
}
}
nir_metadata_preserve(impl, nir_metadata_all);
if (changed) {
nir_metadata_preserve(impl, nir_metadata_dominance |
nir_metadata_block_index);
} else {
nir_metadata_preserve(impl, nir_metadata_all);
}
return changed;
}