[Mesa-dev] [PATCH 3/3] nir: Use nir_shader_get_entrypoint in TCS quad workaround code.

Kenneth Graunke kenneth at whitecape.org
Thu Aug 25 04:15:24 UTC 2016


We want to insert the code at the end of the program.  Looping over
all the functions (of which there was only one) was the old way of doing
this, but now we have nir_shader_get_entrypoint(), so let's use it.

Suggested by Connor Abbott.

v2: Update for nir_shader_get_entrypoint API change.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
---
 src/mesa/drivers/dri/i965/brw_nir_tcs_workarounds.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_nir_tcs_workarounds.c b/src/mesa/drivers/dri/i965/brw_nir_tcs_workarounds.c
index 0626981..6524b7d 100644
--- a/src/mesa/drivers/dri/i965/brw_nir_tcs_workarounds.c
+++ b/src/mesa/drivers/dri/i965/brw_nir_tcs_workarounds.c
@@ -134,19 +134,16 @@ brw_nir_apply_tcs_quads_workaround(nir_shader *nir)
 {
    assert(nir->stage == MESA_SHADER_TESS_CTRL);
 
-   nir_foreach_function(func, nir) {
-      if (!func->impl)
-         continue;
+   nir_function_impl *impl = nir_shader_get_entrypoint(nir);
 
-      nir_builder b;
-      nir_builder_init(&b, func->impl);
+   nir_builder b;
+   nir_builder_init(&b, impl);
 
-      struct set_entry *entry;
-      set_foreach(func->impl->end_block->predecessors, entry) {
-         nir_block *pred = (nir_block *) entry->key;
-         emit_quads_workaround(&b, pred);
-      }
-
-      nir_metadata_preserve(func->impl, 0);
+   struct set_entry *entry;
+   set_foreach(impl->end_block->predecessors, entry) {
+      nir_block *pred = (nir_block *) entry->key;
+      emit_quads_workaround(&b, pred);
    }
+
+   nir_metadata_preserve(impl, 0);
 }
-- 
2.9.3



More information about the mesa-dev mailing list