nir: sort variables by location in nir_lower_io_passes to work around a bug

I don't know why this is necessary, but it unblocks the work on varying
optimizations.

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25394>
This commit is contained in:
Marek Olšák
2023-09-01 18:56:10 -04:00
committed by Marge Bot
parent 3c1020724e
commit f37e32b78b
3 changed files with 23 additions and 0 deletions
+1
View File
@@ -4978,6 +4978,7 @@ bool nir_lower_amul(nir_shader *shader,
bool nir_lower_ubo_vec4(nir_shader *shader);
void nir_sort_variables_by_location(nir_shader *shader, nir_variable_mode mode);
void nir_assign_io_var_locations(nir_shader *shader,
nir_variable_mode mode,
unsigned *size,
+9
View File
@@ -1473,6 +1473,15 @@ sort_varyings(nir_shader *shader, nir_variable_mode mode,
}
}
void
nir_sort_variables_by_location(nir_shader *shader, nir_variable_mode mode)
{
struct exec_list vars;
sort_varyings(shader, mode, &vars);
exec_list_append(&shader->variables, &vars);
}
void
nir_assign_io_var_locations(nir_shader *shader, nir_variable_mode mode,
unsigned *size, gl_shader_stage stage)
+13
View File
@@ -3127,6 +3127,19 @@ nir_lower_io_passes(nir_shader *nir, bool renumber_vs_inputs)
(nir->options->support_indirect_outputs >> nir->info.stage) & 0x1 &&
nir->xfb_info == NULL;
/* TODO: Sorting variables by location is required due to some bug
* in nir_lower_io_to_temporaries. If variables are not sorted,
* dEQP-GLES31.functional.separate_shader.random.0 fails.
*
* This isn't needed if nir_assign_io_var_locations is called because it
* also sorts variables. However, if IO is lowered sooner than that, we
* must sort explicitly here to get what nir_assign_io_var_locations does.
*/
unsigned varying_var_mask =
(nir->info.stage != MESA_SHADER_VERTEX ? nir_var_shader_in : 0) |
(nir->info.stage != MESA_SHADER_FRAGMENT ? nir_var_shader_out : 0);
nir_sort_variables_by_location(nir, varying_var_mask);
if (!has_indirect_inputs || !has_indirect_outputs) {
NIR_PASS_V(nir, nir_lower_io_to_temporaries,
nir_shader_get_entrypoint(nir), !has_indirect_outputs,