Mesa (master): st/mesa: make st_setup_current static

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 6954efce23e54e2bbe9ea554733685bf24acdd5f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6954efce23e54e2bbe9ea554733685bf24acdd5f

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Thu Jan 23 21:10:06 2020 -0500

st/mesa: make st_setup_current static

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

---

 src/mesa/state_tracker/st_atom.h       | 7 -------
 src/mesa/state_tracker/st_atom_array.c | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/mesa/state_tracker/st_atom.h b/src/mesa/state_tracker/st_atom.h
index d5a670a5d16..ede45d66784 100644
--- a/src/mesa/state_tracker/st_atom.h
+++ b/src/mesa/state_tracker/st_atom.h
@@ -66,13 +66,6 @@ st_setup_arrays(struct st_context *st,
                 struct pipe_vertex_buffer *vbuffer, unsigned *num_vbuffers,
                 bool *has_user_vertex_buffers);
 
-void
-st_setup_current(struct st_context *st,
-                 const struct st_vertex_program *vp,
-                 const struct st_common_variant *vp_variant,
-                 struct pipe_vertex_element *velements,
-                 struct pipe_vertex_buffer *vbuffer, unsigned *num_vbuffers);
-
 void
 st_setup_current_user(struct st_context *st,
                       const struct st_vertex_program *vp,
diff --git a/src/mesa/state_tracker/st_atom_array.c b/src/mesa/state_tracker/st_atom_array.c
index 8075ecbd9a3..4b752405018 100644
--- a/src/mesa/state_tracker/st_atom_array.c
+++ b/src/mesa/state_tracker/st_atom_array.c
@@ -191,7 +191,7 @@ st_setup_arrays(struct st_context *st,
 /* ALWAYS_INLINE helps the compiler realize that most of the parameters are
  * on the stack.
  */
-void ALWAYS_INLINE
+static void ALWAYS_INLINE
 st_setup_current(struct st_context *st,
                  const struct st_vertex_program *vp,
                  const struct st_common_variant *vp_variant,