summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2016-04-13 16:26:39 -0700
committerJason Ekstrand <jason.ekstrand@intel.com>2016-05-05 16:19:41 -0700
commit8c807cc2a6b536a737f4ca81143dfd1bb7244e35 (patch)
tree8122f2d2f5b1ec64d3abaa83dd2d1aa3ec5d2a66
parent331b9f73a27c376dcef903dae1096daf356ceeef (diff)
nir/gather_info: fixup for new foreach_block()
Signed-off-by: Jason Ekstrand <jason@jlekstrand.net> Reviewed-by: Connor Abbott <cwabbott0@gmail.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
-rw-r--r--src/compiler/nir/nir_gather_info.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/nir/nir_gather_info.c b/src/compiler/nir/nir_gather_info.c
index 180ceccff2..d45b1a2fec 100644
--- a/src/compiler/nir/nir_gather_info.c
+++ b/src/compiler/nir/nir_gather_info.c
@@ -68,8 +68,8 @@ gather_tex_info(nir_tex_instr *instr, nir_shader *shader)
shader->info.uses_texture_gather = true;
}
-static bool
-gather_info_block(nir_block *block, void *shader)
+static void
+gather_info_block(nir_block *block, nir_shader *shader)
{
nir_foreach_instr(instr, block) {
switch (instr->type) {
@@ -86,8 +86,6 @@ gather_info_block(nir_block *block, void *shader)
break;
}
}
-
- return true;
}
/**
@@ -157,5 +155,7 @@ nir_shader_gather_info(nir_shader *shader, nir_function_impl *entrypoint)
}
}
- nir_foreach_block_call(entrypoint, gather_info_block, shader);
+ nir_foreach_block(block, entrypoint) {
+ gather_info_block(block, shader);
+ }
}