Commit 2956d534 authored by Jason Ekstrand's avatar Jason Ekstrand Committed by Marge Bot

nir: Add nir_foreach_shader_in/out_variable helpers

Reviewed-by: José Casanova Crespo's avatarJose Maria Casanova Crespo <jmcasanova@igalia.com>
Part-of: <!5966>
parent 9bf85722
......@@ -1103,11 +1103,11 @@ setup_vs_output_info(isel_context *ctx, nir_shader *nir,
void
setup_vs_variables(isel_context *ctx, nir_shader *nir)
{
nir_foreach_variable(variable, &nir->inputs)
nir_foreach_shader_in_variable(variable, nir)
{
variable->data.driver_location = variable->data.location * 4;
}
nir_foreach_variable(variable, &nir->outputs)
nir_foreach_shader_out_variable(variable, nir)
{
if (ctx->stage == vertex_vs || ctx->stage == ngg_vertex_gs)
variable->data.driver_location = variable->data.location * 4;
......@@ -1137,7 +1137,7 @@ void setup_gs_variables(isel_context *ctx, nir_shader *nir)
if (ctx->stage == vertex_geometry_gs || ctx->stage == tess_eval_geometry_gs)
ctx->program->config->lds_size = ctx->program->info->gs_ring_info.lds_size; /* Already in units of the alloc granularity */
nir_foreach_variable(variable, &nir->outputs) {
nir_foreach_shader_out_variable(variable, nir) {
variable->data.driver_location = variable->data.location * 4;
}
......@@ -1201,7 +1201,7 @@ setup_tcs_info(isel_context *ctx, nir_shader *nir, nir_shader *vs)
void
setup_tcs_variables(isel_context *ctx, nir_shader *nir)
{
nir_foreach_variable(variable, &nir->outputs) {
nir_foreach_shader_out_variable(variable, nir) {
assert(variable->data.location >= 0 && variable->data.location <= UINT8_MAX);
if (variable->data.location == VARYING_SLOT_TESS_LEVEL_OUTER)
......@@ -1222,7 +1222,7 @@ setup_tes_variables(isel_context *ctx, nir_shader *nir)
ctx->tcs_num_patches = ctx->args->options->key.tes.num_patches;
ctx->tcs_num_outputs = ctx->program->info->tes.num_linked_inputs;
nir_foreach_variable(variable, &nir->outputs) {
nir_foreach_shader_out_variable(variable, nir) {
if (ctx->stage == tess_eval_vs || ctx->stage == ngg_tess_eval_gs)
variable->data.driver_location = variable->data.location * 4;
}
......@@ -1239,7 +1239,7 @@ setup_variables(isel_context *ctx, nir_shader *nir)
{
switch (nir->info.stage) {
case MESA_SHADER_FRAGMENT: {
nir_foreach_variable(variable, &nir->outputs)
nir_foreach_shader_out_variable(variable, nir)
{
int idx = variable->data.location + variable->data.index;
variable->data.driver_location = idx * 4;
......
......@@ -5354,7 +5354,7 @@ void ac_nir_translate(struct ac_llvm_context *ac, struct ac_shader_abi *abi,
ctx.main_function = LLVMGetBasicBlockParent(LLVMGetInsertBlock(ctx.ac.builder));
nir_foreach_variable(variable, &nir->outputs)
nir_foreach_shader_out_variable(variable, nir)
ac_handle_shader_output_decl(&ctx.ac, ctx.abi, nir, variable,
ctx.stage);
......
......@@ -1367,7 +1367,7 @@ handle_vs_input_decl(struct radv_shader_context *ctx,
static void
handle_vs_inputs(struct radv_shader_context *ctx,
struct nir_shader *nir) {
nir_foreach_variable(variable, &nir->inputs)
nir_foreach_shader_in_variable(variable, nir)
handle_vs_input_decl(ctx, variable);
}
......@@ -1377,7 +1377,7 @@ prepare_interp_optimize(struct radv_shader_context *ctx,
{
bool uses_center = false;
bool uses_centroid = false;
nir_foreach_variable(variable, &nir->inputs) {
nir_foreach_shader_in_variable(variable, nir) {
if (glsl_get_base_type(glsl_without_array(variable->type)) != GLSL_TYPE_FLOAT ||
variable->data.sample)
continue;
......@@ -4090,7 +4090,7 @@ LLVMModuleRef ac_translate_nir_to_llvm(struct ac_llvm_compiler *ac_llvm,
ac_emit_barrier(&ctx.ac, ctx.stage);
}
nir_foreach_variable(variable, &shaders[i]->outputs)
nir_foreach_shader_out_variable(variable, shaders[i])
scan_shader_output_decl(&ctx, variable, shaders[i], shaders[i]->info.stage);
ac_setup_rings(&ctx);
......@@ -4409,7 +4409,7 @@ radv_compile_gs_copy_shader(struct ac_llvm_compiler *ac_llvm,
ac_setup_rings(&ctx);
nir_foreach_variable(variable, &geom_shader->outputs) {
nir_foreach_shader_out_variable(variable, geom_shader) {
scan_shader_output_decl(&ctx, variable, geom_shader, MESA_SHADER_VERTEX);
ac_handle_shader_output_decl(&ctx.ac, &ctx.abi, geom_shader,
variable, MESA_SHADER_VERTEX);
......
......@@ -586,7 +586,7 @@ type_size_vec4(const struct glsl_type *type, bool bindless)
static nir_variable *
find_layer_in_var(nir_shader *nir)
{
nir_foreach_variable(var, &nir->inputs) {
nir_foreach_shader_in_variable(var, nir) {
if (var->data.location == VARYING_SLOT_LAYER) {
return var;
}
......
......@@ -679,14 +679,14 @@ radv_nir_shader_info_pass(const struct nir_shader *nir,
info->loads_dynamic_offsets = true;
}
nir_foreach_variable(variable, &nir->inputs)
nir_foreach_shader_in_variable(variable, nir)
gather_info_input_decl(nir, variable, info, key);
nir_foreach_block(block, func->impl) {
gather_info_block(nir, block, info);
}
nir_foreach_variable(variable, &nir->outputs)
nir_foreach_shader_out_variable(variable, nir)
gather_info_output_decl(nir, variable, info, key);
if (nir->info.stage == MESA_SHADER_VERTEX ||
......
......@@ -1517,7 +1517,7 @@ ntq_setup_vs_inputs(struct v3d_compile *c)
* from the start of the attribute to the number of components we
* declare we need in c->vattr_sizes[].
*/
nir_foreach_variable(var, &c->s->inputs) {
nir_foreach_shader_in_variable(var, c->s) {
/* No VS attribute array support. */
assert(MAX2(glsl_get_length(var->type), 1) == 1);
......@@ -1582,7 +1582,7 @@ ntq_setup_vs_inputs(struct v3d_compile *c)
static bool
program_reads_point_coord(struct v3d_compile *c)
{
nir_foreach_variable(var, &c->s->inputs) {
nir_foreach_shader_in_variable(var, c->s) {
if (util_varying_is_point_coord(var->data.location,
c->fs_key->point_sprite_mask)) {
return true;
......@@ -1598,13 +1598,13 @@ get_sorted_input_variables(struct v3d_compile *c,
nir_variable ***vars)
{
*num_entries = 0;
nir_foreach_variable(var, &c->s->inputs)
nir_foreach_shader_in_variable(var, c->s)
(*num_entries)++;
*vars = ralloc_array(c, nir_variable *, *num_entries);
unsigned i = 0;
nir_foreach_variable(var, &c->s->inputs)
nir_foreach_shader_in_variable(var, c->s)
(*vars)[i++] = var;
/* Sort the variables so that we emit the input setup in
......@@ -1687,7 +1687,7 @@ ntq_setup_outputs(struct v3d_compile *c)
if (c->s->info.stage != MESA_SHADER_FRAGMENT)
return;
nir_foreach_variable(var, &c->s->outputs) {
nir_foreach_shader_out_variable(var, c->s) {
unsigned array_len = MAX2(glsl_get_length(var->type), 1);
unsigned loc = var->data.driver_location * 4;
......
......@@ -173,7 +173,7 @@ v3d_nir_lower_vpm_output(struct v3d_compile *c, nir_builder *b,
nir_ssa_def *src = nir_ssa_for_src(b, intr->src[0],
intr->num_components);
nir_variable *var = NULL;
nir_foreach_variable(scan_var, &c->s->outputs) {
nir_foreach_shader_out_variable(scan_var, c->s) {
int components = scan_var->data.compact ?
glsl_get_length(scan_var->type) :
glsl_get_components(scan_var->type);
......@@ -368,7 +368,7 @@ static void
v3d_nir_lower_io_update_output_var_base(struct v3d_compile *c,
struct v3d_nir_lower_io_state *state)
{
nir_foreach_variable_safe(var, &c->s->outputs) {
nir_foreach_shader_out_variable_safe(var, c->s) {
if (var->data.location == VARYING_SLOT_POS &&
state->pos_vpm_offset != -1) {
var->data.driver_location = state->pos_vpm_offset;
......
......@@ -352,7 +352,7 @@ v3d_nir_lower_logic_ops_block(nir_block *block, struct v3d_compile *c)
if (intr->intrinsic != nir_intrinsic_store_output)
continue;
nir_foreach_variable(var, &c->s->outputs) {
nir_foreach_shader_out_variable(var, c->s) {
const int driver_loc = var->data.driver_location;
if (driver_loc != nir_intrinsic_base(intr))
continue;
......
......@@ -859,7 +859,7 @@ v3d_nir_lower_gs_early(struct v3d_compile *c)
static void
v3d_fixup_fs_output_types(struct v3d_compile *c)
{
nir_foreach_variable(var, &c->s->outputs) {
nir_foreach_shader_out_variable(var, c->s) {
uint32_t mask = 0;
switch (var->data.location) {
......
......@@ -2209,14 +2209,14 @@ nir_remap_dual_slot_attributes(nir_shader *shader, uint64_t *dual_slot)
assert(shader->info.stage == MESA_SHADER_VERTEX);
*dual_slot = 0;
nir_foreach_variable(var, &shader->inputs) {
nir_foreach_shader_in_variable(var, shader) {
if (glsl_type_is_dual_slot(glsl_without_array(var->type))) {
unsigned slots = glsl_count_attribute_slots(var->type, true);
*dual_slot |= BITFIELD64_MASK(slots) << var->data.location;
}
}
nir_foreach_variable(var, &shader->inputs) {
nir_foreach_shader_in_variable(var, shader) {
var->data.location +=
util_bitcount64(*dual_slot & BITFIELD64_MASK(var->data.location));
}
......
......@@ -624,6 +624,18 @@ typedef struct nir_variable {
#define nir_foreach_variable_safe(var, var_list) \
foreach_list_typed_safe(nir_variable, var, node, var_list)
#define nir_foreach_shader_in_variable(var, shader) \
nir_foreach_variable(var, &(shader)->inputs)
#define nir_foreach_shader_in_variable_safe(var, shader) \
nir_foreach_variable_safe(var, &(shader)->inputs)
#define nir_foreach_shader_out_variable(var, shader) \
nir_foreach_variable(var, &(shader)->outputs)
#define nir_foreach_shader_out_variable_safe(var, shader) \
nir_foreach_variable_safe(var, &(shader)->outputs)
static inline bool
nir_variable_is_global(const nir_variable *var)
{
......
......@@ -202,7 +202,7 @@ nir_gather_xfb_info_with_varyings(const nir_shader *shader,
unsigned num_outputs = 0;
unsigned num_varyings = 0;
nir_xfb_varyings_info *varyings_info = NULL;
nir_foreach_variable(var, &shader->outputs) {
nir_foreach_shader_out_variable(var, shader) {
if (var->data.explicit_xfb_buffer) {
num_outputs += glsl_count_attribute_slots(var->type, false);
num_varyings += glsl_varying_count(var->type);
......@@ -218,7 +218,7 @@ nir_gather_xfb_info_with_varyings(const nir_shader *shader,
}
/* Walk the list of outputs and add them to the array */
nir_foreach_variable(var, &shader->outputs) {
nir_foreach_shader_out_variable(var, shader) {
if (!var->data.explicit_xfb_buffer)
continue;
......
......@@ -175,7 +175,7 @@ nir_remove_unused_varyings(nir_shader *producer, nir_shader *consumer)
uint64_t read[4] = { 0 }, written[4] = { 0 };
uint64_t patches_read[4] = { 0 }, patches_written[4] = { 0 };
nir_foreach_variable(var, &producer->outputs) {
nir_foreach_shader_out_variable(var, producer) {
for (unsigned i = 0; i < get_num_components(var); i++) {
if (var->data.patch) {
patches_written[var->data.location_frac + i] |=
......@@ -187,7 +187,7 @@ nir_remove_unused_varyings(nir_shader *producer, nir_shader *consumer)
}
}
nir_foreach_variable(var, &consumer->inputs) {
nir_foreach_shader_in_variable(var, consumer) {
for (unsigned i = 0; i < get_num_components(var); i++) {
if (var->data.patch) {
patches_read[var->data.location_frac + i] |=
......@@ -493,7 +493,7 @@ gather_varying_component_info(nir_shader *producer, nir_shader *consumer,
/* Count the number of varying that can be packed and create a mapping
* of those varyings to the array we will pass to qsort.
*/
nir_foreach_variable(var, &producer->outputs) {
nir_foreach_shader_out_variable(var, producer) {
/* Only remap things that aren't builtins. */
if (var->data.location >= VARYING_SLOT_VAR0 &&
......@@ -838,7 +838,7 @@ nir_link_xfb_varyings(nir_shader *producer, nir_shader *consumer)
{
nir_variable *input_vars[MAX_VARYING] = { 0 };
nir_foreach_variable(var, &consumer->inputs) {
nir_foreach_shader_in_variable(var, consumer) {
if (var->data.location >= VARYING_SLOT_VAR0 &&
var->data.location - VARYING_SLOT_VAR0 < MAX_VARYING) {
......@@ -847,7 +847,7 @@ nir_link_xfb_varyings(nir_shader *producer, nir_shader *consumer)
}
}
nir_foreach_variable(var, &producer->outputs) {
nir_foreach_shader_out_variable(var, producer) {
if (var->data.location >= VARYING_SLOT_VAR0 &&
var->data.location - VARYING_SLOT_VAR0 < MAX_VARYING) {
......@@ -872,7 +872,7 @@ does_varying_match(nir_variable *out_var, nir_variable *in_var)
static nir_variable *
get_matching_input_var(nir_shader *consumer, nir_variable *out_var)
{
nir_foreach_variable(var, &consumer->inputs) {
nir_foreach_shader_in_variable(var, consumer) {
if (does_varying_match(out_var, var))
return var;
}
......@@ -1253,7 +1253,7 @@ nir_assign_linked_io_var_locations(nir_shader *producer, nir_shader *consumer)
uint64_t producer_output_mask = 0;
uint64_t producer_patch_output_mask = 0;
nir_foreach_variable(variable, &producer->outputs) {
nir_foreach_shader_out_variable(variable, producer) {
uint64_t mask = get_linked_variable_io_mask(variable, producer->info.stage);
uint64_t loc = get_linked_variable_location(variable->data.location, variable->data.patch);
......@@ -1266,7 +1266,7 @@ nir_assign_linked_io_var_locations(nir_shader *producer, nir_shader *consumer)
uint64_t consumer_input_mask = 0;
uint64_t consumer_patch_input_mask = 0;
nir_foreach_variable(variable, &consumer->inputs) {
nir_foreach_shader_in_variable(variable, consumer) {
uint64_t mask = get_linked_variable_io_mask(variable, consumer->info.stage);
uint64_t loc = get_linked_variable_location(variable->data.location, variable->data.patch);
......@@ -1279,7 +1279,7 @@ nir_assign_linked_io_var_locations(nir_shader *producer, nir_shader *consumer)
uint64_t io_mask = producer_output_mask | consumer_input_mask;
uint64_t patch_io_mask = producer_patch_output_mask | consumer_patch_input_mask;
nir_foreach_variable(variable, &producer->outputs) {
nir_foreach_shader_out_variable(variable, producer) {
uint64_t loc = get_linked_variable_location(variable->data.location, variable->data.patch);
if (variable->data.patch)
......@@ -1288,7 +1288,7 @@ nir_assign_linked_io_var_locations(nir_shader *producer, nir_shader *consumer)
variable->data.driver_location = util_bitcount64(io_mask & u_bit_consecutive64(0, loc)) * 4;
}
nir_foreach_variable(variable, &consumer->inputs) {
nir_foreach_shader_in_variable(variable, consumer) {
uint64_t loc = get_linked_variable_location(variable->data.location, variable->data.patch);
if (variable->data.patch)
......
......@@ -61,7 +61,7 @@ nir_lower_alpha_test(nir_shader *shader, enum compare_func func,
break;
case nir_intrinsic_store_output:
/* already had i/o lowered.. lookup the matching output var: */
nir_foreach_variable(var, &shader->outputs) {
nir_foreach_shader_out_variable(var, shader) {
int drvloc = var->data.driver_location;
if (nir_intrinsic_base(intr) == drvloc) {
out = var;
......
......@@ -58,7 +58,7 @@ get_texcoord(nir_shader *shader)
nir_variable *texcoord = NULL;
/* find gl_TexCoord, if it exists: */
nir_foreach_variable(var, &shader->inputs) {
nir_foreach_shader_in_variable(var, shader) {
if (var->data.location == VARYING_SLOT_TEX0) {
texcoord = var;
break;
......
......@@ -68,7 +68,7 @@ lower_intrinsic(lower_state *state, nir_intrinsic_instr *intr)
break;
case nir_intrinsic_store_output:
/* already had i/o lowered.. lookup the matching output var: */
nir_foreach_variable(var, &state->shader->outputs) {
nir_foreach_shader_out_variable(var, state->shader) {
int drvloc = var->data.driver_location;
if (nir_intrinsic_base(intr) == drvloc) {
out = var;
......
......@@ -184,7 +184,7 @@ find_clipvertex_and_position_outputs(nir_shader *shader,
nir_variable **clipvertex,
nir_variable **position)
{
nir_foreach_variable(var, &shader->outputs) {
nir_foreach_shader_out_variable(var, shader) {
switch (var->data.location) {
case VARYING_SLOT_POS:
*position = var;
......@@ -464,7 +464,7 @@ fs_has_clip_dist_input_var(nir_shader *shader, nir_variable **io_vars,
unsigned *ucp_enables)
{
assert(shader->info.stage == MESA_SHADER_FRAGMENT);
nir_foreach_variable(var, &shader->inputs) {
nir_foreach_shader_in_variable(var, shader) {
switch (var->data.location) {
case VARYING_SLOT_CLIP_DIST0:
assert(var->data.compact);
......
......@@ -101,7 +101,7 @@ nir_lower_clip_disable(nir_shader *shader, unsigned clip_plane_enable)
{
bool progress = false;
nir_foreach_variable(var, &shader->outputs) {
nir_foreach_shader_out_variable(var, shader) {
if (var->data.location == VARYING_SLOT_CLIP_DIST0) {
unsigned size = glsl_get_length(var->type);
/* if currently-enabled planes match used planes then no-op */
......
......@@ -45,7 +45,7 @@ get_texcoord(lower_drawpixels_state *state)
nir_variable *texcoord = NULL;
/* find gl_TexCoord, if it exists: */
nir_foreach_variable(var, &state->shader->inputs) {
nir_foreach_shader_in_variable(var, state->shader) {
if (var->data.location == VARYING_SLOT_TEX0) {
texcoord = var;
break;
......@@ -267,7 +267,7 @@ lower_drawpixels_block(lower_drawpixels_state *state, nir_block *block)
/* The intrinsic doesn't carry the variable. We need to find it
* manually.
*/
nir_foreach_variable(var, &state->b.shader->inputs) {
nir_foreach_shader_in_variable(var, state->b.shader) {
if ((var->data.driver_location == nir_intrinsic_base(intr)) &&
(nir_intrinsic_component(intr) >= var->data.location_frac &&
nir_intrinsic_component(intr) <
......
......@@ -42,7 +42,7 @@ nir_lower_flatshade(nir_shader *shader)
{
bool progress = false;
nir_foreach_variable(var, &shader->inputs) {
nir_foreach_shader_in_variable(var, shader) {
progress |= lower_input(shader, var);
}
......
......@@ -27,7 +27,7 @@
static nir_ssa_def *
load_frag_coord(nir_builder *b)
{
nir_foreach_variable(var, &b->shader->inputs) {
nir_foreach_shader_in_variable(var, b->shader) {
if (var->data.location == VARYING_SLOT_POS)
return nir_load_var(b, var);
}
......
......@@ -47,7 +47,7 @@ nir_lower_mediump_outputs(nir_shader *nir)
if (intr->intrinsic != nir_intrinsic_store_output)
continue;
nir_foreach_variable (var, &nir->outputs) {
nir_foreach_shader_out_variable(var, nir) {
if (var->data.driver_location != nir_intrinsic_base(intr))
continue; /* not found yet */
......
......@@ -72,7 +72,7 @@ nir_lower_point_size_mov(nir_shader *shader,
shader->info.stage != MESA_SHADER_COMPUTE);
nir_variable *out = NULL;
nir_foreach_variable(var, &shader->outputs) {
nir_foreach_shader_out_variable(var, shader) {
if (var->data.location == VARYING_SLOT_PSIZ) {
out = var;
break;
......
......@@ -69,7 +69,7 @@ create_input(nir_shader *shader, gl_varying_slot slot,
static nir_variable *
create_face_input(nir_shader *shader)
{
nir_foreach_variable(var, &shader->inputs) {
nir_foreach_shader_in_variable(var, shader) {
if (var->data.location == VARYING_SLOT_FACE)
return var;
}
......@@ -108,7 +108,7 @@ static int
setup_inputs(lower_2side_state *state)
{
/* find color inputs: */
nir_foreach_variable(var, &state->shader->inputs) {
nir_foreach_shader_in_variable(var, state->shader) {
switch (var->data.location) {
case VARYING_SLOT_COL0:
case VARYING_SLOT_COL1:
......
......@@ -1141,7 +1141,7 @@ search_phi_bcsel(nir_ssa_scalar scalar, nir_ssa_scalar *buf, unsigned buf_size,
static nir_variable *
lookup_input(nir_shader *shader, unsigned driver_location)
{
nir_foreach_variable(var, &shader->inputs) {
nir_foreach_shader_in_variable(var, shader) {
if (driver_location == var->data.driver_location)
return var;
}
......
......@@ -3342,7 +3342,7 @@ emit_instructions(struct ir3_context *ctx)
}
/* Setup inputs: */
nir_foreach_variable (var, &ctx->s->inputs) {
nir_foreach_shader_in_variable (var, ctx->s) {
setup_input(ctx, var);
}
......@@ -3390,7 +3390,7 @@ emit_instructions(struct ir3_context *ctx)
}
/* Setup outputs: */
nir_foreach_variable (var, &ctx->s->outputs) {
nir_foreach_shader_out_variable (var, ctx->s) {
setup_output(ctx, var);
}
......
......@@ -310,7 +310,7 @@ static bool
ir3_nir_lower_layer_id(nir_shader *nir)
{
unsigned layer_id_loc = ~0;
nir_foreach_variable(var, &nir->inputs) {
nir_foreach_shader_in_variable(var, nir) {
if (var->data.location == VARYING_SLOT_LAYER) {
layer_id_loc = var->data.driver_location;
break;
......
......@@ -928,8 +928,8 @@ ir3_link_geometry_stages(const struct ir3_shader_variant *producer,
unreachable("bad shader stage");
}
nir_foreach_variable(in_var, &consumer->shader->nir->inputs) {
nir_foreach_variable(out_var, &producer->shader->nir->outputs) {
nir_foreach_shader_in_variable(in_var, consumer->shader->nir) {
nir_foreach_shader_out_variable(out_var, producer->shader->nir) {
if (in_var->data.location == out_var->data.location) {
locs[in_var->data.driver_location] =
producer->output_loc[out_var->data.driver_location] * factor;
......
......@@ -1963,7 +1963,7 @@ bool lp_build_nir_llvm(
nir_remove_dead_derefs(nir);
nir_remove_dead_variables(nir, nir_var_function_temp, NULL);
nir_foreach_variable(variable, &nir->outputs)
nir_foreach_shader_out_variable(variable, nir)
handle_shader_output_decl(bld_base, nir, variable);
bld_base->regs = _mesa_hash_table_create(NULL, _mesa_hash_pointer,
......
......@@ -49,7 +49,7 @@ typedef struct {
static nir_ssa_def *
load_frag_coord(nir_builder *b)
{
nir_foreach_variable(var, &b->shader->inputs) {
nir_foreach_shader_in_variable(var, b->shader) {
if (var->data.location == VARYING_SLOT_POS)
return nir_load_var(b, var);
}
......@@ -216,7 +216,7 @@ nir_lower_aaline_fs(struct nir_shader *shader, int *varying)
return;
int highest_location = -1, highest_drv_location = -1;
nir_foreach_variable(var, &shader->inputs) {
nir_foreach_shader_in_variable(var, shader) {
if ((int)var->data.location > highest_location)
highest_location = var->data.location;
if ((int)var->data.driver_location > highest_drv_location)
......@@ -340,7 +340,7 @@ nir_lower_aapoint_fs(struct nir_shader *shader, int *varying)
return;
int highest_location = -1, highest_drv_location = -1;
nir_foreach_variable(var, &shader->inputs) {
nir_foreach_shader_in_variable(var, shader) {
if ((int)var->data.location > highest_location)
highest_location = var->data.location;
if ((int)var->data.driver_location > highest_drv_location)
......
......@@ -489,7 +489,7 @@ void nir_tgsi_scan_shader(const struct nir_shader *nir,
i = 0;
uint64_t processed_inputs = 0;
nir_foreach_variable(variable, &nir->inputs) {
nir_foreach_shader_in_variable(variable, nir) {
unsigned semantic_name, semantic_index;
const struct glsl_type *type = variable->type;
......@@ -573,7 +573,7 @@ void nir_tgsi_scan_shader(const struct nir_shader *nir,
i = 0;
uint64_t processed_outputs = 0;
unsigned num_outputs = 0;
nir_foreach_variable(variable, &nir->outputs) {
nir_foreach_shader_out_variable(variable, nir) {
unsigned semantic_name, semantic_index;
i = variable->data.driver_location;
......
......@@ -1068,7 +1068,7 @@ etna_compile_shader_nir(struct etna_shader_variant *v)
/* setup input linking */
struct etna_shader_io_file *sf = &v->infile;
if (s->info.stage == MESA_SHADER_VERTEX) {
nir_foreach_variable(var, &s->inputs) {
nir_foreach_shader_in_variable(var, s) {