From 80683943d1df6ad9bd82066809fa28bc6c9287c9 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 4 Apr 2022 19:08:13 -0400 Subject: [PATCH] mesa/st: simplify st_can_add_pointsize_to_program iterator MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák Part-of: --- src/mesa/state_tracker/st_program.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index 0b750c4ff30..5a7147809e9 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -1929,12 +1929,7 @@ st_can_add_pointsize_to_program(struct st_context *st, struct gl_program *prog) st->ctx->Const.Program[nir->info.stage].MaxOutputComponents * 4; unsigned num_components = 0; unsigned needed_components = nir->info.stage == MESA_SHADER_GEOMETRY ? nir->info.gs.vertices_out : 1; - u_foreach_bit64(loc, nir->info.outputs_written) { - nir_variable *var = NULL; - unsigned location = loc; //can't modify bit iterator - while (!var) - var = nir_find_variable_with_location(nir, nir_var_shader_out, location--); - assert(var); + nir_foreach_shader_out_variable(var, nir) { num_components += glsl_count_dword_slots(var->type, false); } /* Ensure that there is enough attribute space to emit at least one primitive */