From: Chia-I Wu <olvaffe@gmail.com>
Date: Fri, 15 Jul 2022 21:18:58 +0000 (-0700)
Subject: ir3: increment constoff right after it is assigned
X-Git-Tag: upstream/22.3.5~5612
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e3ba8a2f07d1fbadf9d21a35fe5c1a2c1b4eeec7;p=platform%2Fupstream%2Fmesa.git

ir3: increment constoff right after it is assigned

Minor improvement to readability.  No real change.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17570>
---

diff --git a/src/freedreno/ir3/ir3_nir.c b/src/freedreno/ir3/ir3_nir.c
index 63d7bb2..9a08dc1 100644
--- a/src/freedreno/ir3/ir3_nir.c
+++ b/src/freedreno/ir3/ir3_nir.c
@@ -1008,13 +1008,17 @@ ir3_setup_const_state(nir_shader *nir, struct ir3_shader_variant *v,
    case MESA_SHADER_TESS_EVAL:
       constoff = align(constoff - 1, 4) + 3;
       const_state->offsets.primitive_param = constoff;
-      const_state->offsets.primitive_map = constoff + 5;
-      constoff += 5 + DIV_ROUND_UP(v->input_size, 4);
+      constoff += 5;
+
+      const_state->offsets.primitive_map = constoff;
+      constoff += DIV_ROUND_UP(v->input_size, 4);
       break;
    case MESA_SHADER_GEOMETRY:
       const_state->offsets.primitive_param = constoff;
-      const_state->offsets.primitive_map = constoff + 1;
-      constoff += 1 + DIV_ROUND_UP(v->input_size, 4);
+      constoff += 1;
+
+      const_state->offsets.primitive_map = constoff;
+      constoff += DIV_ROUND_UP(v->input_size, 4);
       break;
    default:
       break;