Simplifies the code (we don't have struct or matrix varyings that would
have previously made this code break), and makes sure we keep
s->num_outputs accurate.
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
Reviewed-by: Jose Maria Casanova Crespo <jmcasanova@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4670>
nir_imm_int(b, ~colormask)));
}
nir_imm_int(b, ~colormask)));
}
-static int
-vc4_nir_next_output_driver_location(nir_shader *s)
-{
- int maxloc = -1;
-
- nir_foreach_variable(var, &s->outputs)
- maxloc = MAX2(maxloc, (int)var->data.driver_location);
-
- return maxloc + 1;
-}
-
static void
vc4_nir_store_sample_mask(struct vc4_compile *c, nir_builder *b,
nir_ssa_def *val)
static void
vc4_nir_store_sample_mask(struct vc4_compile *c, nir_builder *b,
nir_ssa_def *val)
nir_variable *sample_mask = nir_variable_create(c->s, nir_var_shader_out,
glsl_uint_type(),
"sample_mask");
nir_variable *sample_mask = nir_variable_create(c->s, nir_var_shader_out,
glsl_uint_type(),
"sample_mask");
- sample_mask->data.driver_location =
- vc4_nir_next_output_driver_location(c->s);
+ sample_mask->data.driver_location = c->s->num_outputs++;
sample_mask->data.location = FRAG_RESULT_SAMPLE_MASK;
nir_intrinsic_instr *intr =
sample_mask->data.location = FRAG_RESULT_SAMPLE_MASK;
nir_intrinsic_instr *intr =