nir: Move new edgeflag assert into the io_lowered case

We only need to assert this in the `io_lowered` case, which actually
uses num_outputs.  This assert also doesn't appear to hold on iris,
where num_outputs is showing up as 0 (because it's likely not yet set).

Fixes assertion failures in edgeflag related tests on iris, which
doesn't use the io_lowered path currently.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3456
Fixes: 484a60d547 ("nir: generate lowered IO in nir_lower_passthrough_edgeflags")
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6450>
This commit is contained in:
Kenneth Graunke
2020-08-24 17:00:33 -07:00
committed by Marge Bot
parent 2fcfcca842
commit 2a9ffc24cc

View File

@@ -37,10 +37,12 @@ lower_impl(nir_function_impl *impl)
/* The edge flag is the last input in st/mesa. */
assert(shader->num_inputs == util_bitcount64(shader->info.inputs_read));
assert(shader->num_outputs == util_bitcount64(shader->info.outputs_written));
/* Lowered IO only uses intrinsics. It doesn't use variables. */
if (shader->info.io_lowered) {
assert(shader->num_outputs ==
util_bitcount64(shader->info.outputs_written));
/* Load an edge flag. */
nir_intrinsic_instr *load =
nir_intrinsic_instr_create(shader, nir_intrinsic_load_input);