Mesa (main): freedreno/ir3/lower_io_offsets: Drop gpu_id param

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Aug 6 19:21:23 UTC 2021


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

Author: Rob Clark <robdclark at chromium.org>
Date:   Sat Jul 31 12:35:57 2021 -0700

freedreno/ir3/lower_io_offsets: Drop gpu_id param

It was unused.

Signed-off-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12159>

---

 src/freedreno/ir3/ir3_nir.c                  |  2 +-
 src/freedreno/ir3/ir3_nir.h                  |  2 +-
 src/freedreno/ir3/ir3_nir_lower_io_offsets.c | 11 +++++------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/freedreno/ir3/ir3_nir.c b/src/freedreno/ir3/ir3_nir.c
index 08ba6b8b115..db646674d89 100644
--- a/src/freedreno/ir3/ir3_nir.c
+++ b/src/freedreno/ir3/ir3_nir.c
@@ -674,7 +674,7 @@ ir3_nir_lower_variant(struct ir3_shader_variant *so, nir_shader *s)
    if (so->shader->compiler->gen >= 6)
       progress |= OPT(s, nir_lower_ubo_vec4);
 
-   OPT_V(s, ir3_nir_lower_io_offsets, so->shader->compiler->gpu_id);
+   OPT_V(s, ir3_nir_lower_io_offsets);
 
    if (progress)
       ir3_optimize_loop(so->shader->compiler, s);
diff --git a/src/freedreno/ir3/ir3_nir.h b/src/freedreno/ir3/ir3_nir.h
index 1e85667a3d3..d1049364f65 100644
--- a/src/freedreno/ir3/ir3_nir.h
+++ b/src/freedreno/ir3/ir3_nir.h
@@ -36,7 +36,7 @@
 bool ir3_nir_apply_trig_workarounds(nir_shader *shader);
 bool ir3_nir_lower_imul(nir_shader *shader);
 bool ir3_nir_lower_tg4_to_tex(nir_shader *shader);
-bool ir3_nir_lower_io_offsets(nir_shader *shader, int gpu_id);
+bool ir3_nir_lower_io_offsets(nir_shader *shader);
 bool ir3_nir_lower_load_barycentric_at_sample(nir_shader *shader);
 bool ir3_nir_lower_load_barycentric_at_offset(nir_shader *shader);
 bool ir3_nir_move_varying_inputs(nir_shader *shader);
diff --git a/src/freedreno/ir3/ir3_nir_lower_io_offsets.c b/src/freedreno/ir3/ir3_nir_lower_io_offsets.c
index f28e9ecb71a..da680d40102 100644
--- a/src/freedreno/ir3/ir3_nir_lower_io_offsets.c
+++ b/src/freedreno/ir3/ir3_nir_lower_io_offsets.c
@@ -252,8 +252,7 @@ lower_offset_for_ssbo(nir_intrinsic_instr *intrinsic, nir_builder *b,
 }
 
 static bool
-lower_io_offsets_block(nir_block *block, nir_builder *b, void *mem_ctx,
-                       int gpu_id)
+lower_io_offsets_block(nir_block *block, nir_builder *b, void *mem_ctx)
 {
    bool progress = false;
 
@@ -278,7 +277,7 @@ lower_io_offsets_block(nir_block *block, nir_builder *b, void *mem_ctx,
 }
 
 static bool
-lower_io_offsets_func(nir_function_impl *impl, int gpu_id)
+lower_io_offsets_func(nir_function_impl *impl)
 {
    void *mem_ctx = ralloc_parent(impl);
    nir_builder b;
@@ -286,7 +285,7 @@ lower_io_offsets_func(nir_function_impl *impl, int gpu_id)
 
    bool progress = false;
    nir_foreach_block_safe (block, impl) {
-      progress |= lower_io_offsets_block(block, &b, mem_ctx, gpu_id);
+      progress |= lower_io_offsets_block(block, &b, mem_ctx);
    }
 
    if (progress) {
@@ -298,13 +297,13 @@ lower_io_offsets_func(nir_function_impl *impl, int gpu_id)
 }
 
 bool
-ir3_nir_lower_io_offsets(nir_shader *shader, int gpu_id)
+ir3_nir_lower_io_offsets(nir_shader *shader)
 {
    bool progress = false;
 
    nir_foreach_function (function, shader) {
       if (function->impl)
-         progress |= lower_io_offsets_func(function->impl, gpu_id);
+         progress |= lower_io_offsets_func(function->impl);
    }
 
    return progress;



More information about the mesa-commit mailing list