vc4: Use nir_foreach_variable
Signed-off-by: Boyan Ding <boyan.j.ding@gmail.com> Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
@@ -393,7 +393,7 @@ vc4_nir_lower_blend_block(nir_block *block, void *state)
|
||||
continue;
|
||||
|
||||
nir_variable *output_var = NULL;
|
||||
foreach_list_typed(nir_variable, var, node, &c->s->outputs) {
|
||||
nir_foreach_variable(var, &c->s->outputs) {
|
||||
if (var->data.driver_location == intr->const_index[0]) {
|
||||
output_var = var;
|
||||
break;
|
||||
|
||||
@@ -63,7 +63,7 @@ vc4_nir_lower_input(struct vc4_compile *c, nir_builder *b,
|
||||
}
|
||||
|
||||
nir_variable *input_var = NULL;
|
||||
foreach_list_typed(nir_variable, var, node, &c->s->inputs) {
|
||||
nir_foreach_variable(var, &c->s->inputs) {
|
||||
if (var->data.driver_location == intr->const_index[0]) {
|
||||
input_var = var;
|
||||
break;
|
||||
@@ -129,7 +129,7 @@ vc4_nir_lower_output(struct vc4_compile *c, nir_builder *b,
|
||||
nir_intrinsic_instr *intr)
|
||||
{
|
||||
nir_variable *output_var = NULL;
|
||||
foreach_list_typed(nir_variable, var, node, &c->s->outputs) {
|
||||
nir_foreach_variable(var, &c->s->outputs) {
|
||||
if (var->data.driver_location == intr->const_index[0]) {
|
||||
output_var = var;
|
||||
break;
|
||||
|
||||
@@ -1383,13 +1383,13 @@ static void
|
||||
ntq_setup_inputs(struct vc4_compile *c)
|
||||
{
|
||||
unsigned num_entries = 0;
|
||||
foreach_list_typed(nir_variable, var, node, &c->s->inputs)
|
||||
nir_foreach_variable(var, &c->s->inputs)
|
||||
num_entries++;
|
||||
|
||||
nir_variable *vars[num_entries];
|
||||
|
||||
unsigned i = 0;
|
||||
foreach_list_typed(nir_variable, var, node, &c->s->inputs)
|
||||
nir_foreach_variable(var, &c->s->inputs)
|
||||
vars[i++] = var;
|
||||
|
||||
/* Sort the variables so that we emit the input setup in
|
||||
@@ -1432,7 +1432,7 @@ ntq_setup_inputs(struct vc4_compile *c)
|
||||
static void
|
||||
ntq_setup_outputs(struct vc4_compile *c)
|
||||
{
|
||||
foreach_list_typed(nir_variable, var, node, &c->s->outputs) {
|
||||
nir_foreach_variable(var, &c->s->outputs) {
|
||||
unsigned array_len = MAX2(glsl_get_length(var->type), 1);
|
||||
unsigned loc = var->data.driver_location * 4;
|
||||
|
||||
@@ -1471,7 +1471,7 @@ ntq_setup_outputs(struct vc4_compile *c)
|
||||
static void
|
||||
ntq_setup_uniforms(struct vc4_compile *c)
|
||||
{
|
||||
foreach_list_typed(nir_variable, var, node, &c->s->uniforms) {
|
||||
nir_foreach_variable(var, &c->s->uniforms) {
|
||||
unsigned array_len = MAX2(glsl_get_length(var->type), 1);
|
||||
unsigned array_elem_size = 4 * sizeof(float);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user