Mesa (main): Revert "nir: make tgsi_varying_semantic_to_slot(..) public"

[GitLab Mirror]

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

Author: Christian Gmeiner <christian.gmeiner at gmail.com>
Date:   Thu Sep 16 07:32:28 2021 +0200

Revert "nir: make tgsi_varying_semantic_to_slot(..) public"

This reverts commit edbdd977232f0cfe8f26a44ddbda792780168f4a.

As etnaviv's TGSI compiler is gone we make that function
private again.

Signed-off-by: Christian Gmeiner <christian.gmeiner at gmail.com>
Acked-by: Lucas Stach <l.stach at pengutronix.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12889>

---

 src/gallium/auxiliary/nir/tgsi_to_nir.c | 2 +-
 src/gallium/auxiliary/nir/tgsi_to_nir.h | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c
index a3bf9a848e9..9c5a1ad8af8 100644
--- a/src/gallium/auxiliary/nir/tgsi_to_nir.c
+++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c
@@ -100,7 +100,7 @@ struct ttn_compile {
 #define ttn_channel(b, src, swiz) \
    nir_channel(b, src, TGSI_SWIZZLE_##swiz)
 
-gl_varying_slot
+static gl_varying_slot
 tgsi_varying_semantic_to_slot(unsigned semantic, unsigned index)
 {
    switch (semantic) {
diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.h b/src/gallium/auxiliary/nir/tgsi_to_nir.h
index 5d8b21dcd76..da765753b09 100644
--- a/src/gallium/auxiliary/nir/tgsi_to_nir.h
+++ b/src/gallium/auxiliary/nir/tgsi_to_nir.h
@@ -40,9 +40,6 @@ struct nir_shader *
 tgsi_to_nir_noscreen(const void *tgsi_tokens,
                      const nir_shader_compiler_options *options);
 
-gl_varying_slot
-tgsi_varying_semantic_to_slot(unsigned semantic, unsigned index);
-
 #ifdef __cplusplus
 }
 #endif