Mesa (main): glsl: simplify finding cursor in varying packing code

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 9b146368768b3049c547a36f049b46f295713e39
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9b146368768b3049c547a36f049b46f295713e39

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Mon May 16 23:37:50 2022 +1000

glsl: simplify finding cursor in varying packing code

This is simpler and also avoids an assert() when the last
block is empty.

Fixes: e3a45a47789f ("glsl: implement lower_packed_varyings() as a NIR pass")

Acked-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16527>

---

 src/compiler/glsl/gl_nir_lower_packed_varyings.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/glsl/gl_nir_lower_packed_varyings.c b/src/compiler/glsl/gl_nir_lower_packed_varyings.c
index 034f1e2c20c..f7ecb19fef3 100644
--- a/src/compiler/glsl/gl_nir_lower_packed_varyings.c
+++ b/src/compiler/glsl/gl_nir_lower_packed_varyings.c
@@ -937,7 +937,7 @@ lower_output_var(struct lower_packed_varyings_state *state, nir_variable *var)
             state->b.cursor = nir_before_instr(nir_block_last_instr(block));
             pack_output_var(state, var);
          } else if (block == nir_impl_last_block(state->impl)) {
-            state->b.cursor = nir_after_instr(nir_block_last_instr(block));
+            state->b.cursor = nir_after_block(block);
             pack_output_var(state, var);
          }
       } else {