zink: run scan_nir before variable rework

this will enable using its heuristics when generating variables

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28466>
This commit is contained in:
Mike Blumenkrantz 2024-03-15 13:46:39 -04:00 committed by Marge Bot
parent 88792b9ea3
commit 332c24774c

View file

@ -5515,6 +5515,7 @@ zink_shader_create(struct zink_screen *screen, struct nir_shader *nir)
nir_gather_xfb_info_from_intrinsics(nir);
/* clean up io to improve direct access */
optimize_nir(nir, NULL, true);
scan_nir(screen, nir, ret);
rework_io_vars(nir, nir_var_shader_in);
rework_io_vars(nir, nir_var_shader_out);
nir_sort_variables_by_location(nir, nir_var_shader_in);
@ -5587,7 +5588,6 @@ zink_shader_create(struct zink_screen *screen, struct nir_shader *nir)
optimize_nir(nir, NULL, true);
prune_io(nir);
scan_nir(screen, nir, ret);
unsigned sampler_mask = 0;
if (nir->info.stage == MESA_SHADER_KERNEL) {
NIR_PASS_V(nir, type_images, &sampler_mask);