Mesa (main): mesa: make _mesa_associate_uniform_storage() static

[GitLab Mirror]

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

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Sun Dec  5 13:01:26 2021 +1100

mesa: make _mesa_associate_uniform_storage() static

The function is no longer called directly outside of this file.

Reviewed-by: Dave Airlie <airlied at redhat.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14066>

---

 src/mesa/program/ir_to_mesa.cpp | 12 ++++++------
 src/mesa/program/ir_to_mesa.h   |  4 ----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index af3f2a42d0e..7de6c16ce5d 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -2467,10 +2467,10 @@ _mesa_generate_parameters_list_for_uniforms(struct gl_context *ctx,
    }
 }
 
-void
-_mesa_associate_uniform_storage(struct gl_context *ctx,
-                                struct gl_shader_program *shader_program,
-                                struct gl_program *prog)
+static void
+associate_uniform_storage(struct gl_context *ctx,
+                          struct gl_shader_program *shader_program,
+                          struct gl_program *prog)
 {
    struct gl_program_parameter_list *params = prog->Parameters;
    gl_shader_stage shader_type = prog->info.stage;
@@ -2633,7 +2633,7 @@ _mesa_ensure_and_associate_uniform_storage(struct gl_context *ctx,
     * prog->ParameterValues to get reallocated (e.g., anything that adds a
     * program constant) has to happen before creating this linkage.
     */
-   _mesa_associate_uniform_storage(ctx, shader_program, prog);
+   associate_uniform_storage(ctx, shader_program, prog);
 }
 
 /*
@@ -2987,7 +2987,7 @@ get_mesa_program(struct gl_context *ctx,
     * prog->ParameterValues to get reallocated (e.g., anything that adds a
     * program constant) has to happen before creating this linkage.
     */
-   _mesa_associate_uniform_storage(ctx, shader_program, prog);
+   associate_uniform_storage(ctx, shader_program, prog);
    if (!shader_program->data->LinkStatus) {
       goto fail_exit;
    }
diff --git a/src/mesa/program/ir_to_mesa.h b/src/mesa/program/ir_to_mesa.h
index 25d4fc89932..8bb48fdc4c6 100644
--- a/src/mesa/program/ir_to_mesa.h
+++ b/src/mesa/program/ir_to_mesa.h
@@ -46,10 +46,6 @@ _mesa_generate_parameters_list_for_uniforms(struct gl_context *ctx,
 					    struct gl_linked_shader *sh,
 					    struct gl_program_parameter_list
 					    *params);
-void
-_mesa_associate_uniform_storage(struct gl_context *ctx,
-                                struct gl_shader_program *shader_program,
-                                struct gl_program *prog);
 
 void
 _mesa_ensure_and_associate_uniform_storage(struct gl_context *ctx,