From c46cd101e1c84a50c4fb21b4600cc8f32fef41e8 Mon Sep 17 00:00:00 2001
From: Karol Herbst <git@karolherbst.de>
Date: Sun, 17 Sep 2023 12:42:58 +0200
Subject: [PATCH] rusticl: move mesa_version_string out of the inline wrapper

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25265>
---
 .../rusticl/rusticl_mesa_inline_bindings_wrapper.c        | 7 -------
 .../rusticl/rusticl_mesa_inline_bindings_wrapper.h        | 1 -
 src/gallium/frontends/rusticl/rusticl_system_bindings.c   | 8 ++++++++
 src/gallium/frontends/rusticl/rusticl_system_bindings.h   | 2 ++
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/gallium/frontends/rusticl/rusticl_mesa_inline_bindings_wrapper.c b/src/gallium/frontends/rusticl/rusticl_mesa_inline_bindings_wrapper.c
index 546d0c5106a76..002b5110ecc6f 100644
--- a/src/gallium/frontends/rusticl/rusticl_mesa_inline_bindings_wrapper.c
+++ b/src/gallium/frontends/rusticl/rusticl_mesa_inline_bindings_wrapper.c
@@ -1,5 +1,4 @@
 #include "rusticl_mesa_inline_bindings_wrapper.h"
-#include "git_sha1.h"
 
 void
 blob_finish(struct blob *blob)
@@ -49,12 +48,6 @@ util_format_pack_rgba(enum pipe_format format, void *dst, const void *src, unsig
     return __util_format_pack_rgba(format, dst, src, w);
 }
 
-const char*
-mesa_version_string(void)
-{
-    return PACKAGE_VERSION MESA_GIT_SHA1;
-}
-
 bool
 glsl_type_is_sampler(const struct glsl_type *t)
 {
diff --git a/src/gallium/frontends/rusticl/rusticl_mesa_inline_bindings_wrapper.h b/src/gallium/frontends/rusticl/rusticl_mesa_inline_bindings_wrapper.h
index 814421c27a440..a29400046f5bb 100644
--- a/src/gallium/frontends/rusticl/rusticl_mesa_inline_bindings_wrapper.h
+++ b/src/gallium/frontends/rusticl/rusticl_mesa_inline_bindings_wrapper.h
@@ -41,7 +41,6 @@
 void blob_finish(struct blob *);
 char *mesa_bytes_to_hex(char *buf, const uint8_t *hex_id, unsigned size);
 bool disk_cache_get_function_identifier(void *ptr, struct mesa_sha1 *ctx);
-const char* mesa_version_string(void);
 nir_function_impl *nir_shader_get_entrypoint(const nir_shader *shader);
 void pipe_resource_reference(struct pipe_resource **dst, struct pipe_resource *src);
 bool should_skip_nir(const char *);
diff --git a/src/gallium/frontends/rusticl/rusticl_system_bindings.c b/src/gallium/frontends/rusticl/rusticl_system_bindings.c
index 3ad4f21c08414..356a9a6a9442c 100644
--- a/src/gallium/frontends/rusticl/rusticl_system_bindings.c
+++ b/src/gallium/frontends/rusticl/rusticl_system_bindings.c
@@ -1,5 +1,7 @@
 #include "rusticl_system_bindings.h"
 
+#include "git_sha1.h"
+
 FILE *
 stdout_ptr(void)
 {
@@ -11,3 +13,9 @@ stderr_ptr(void)
 {
     return stderr;
 }
+
+const char*
+mesa_version_string(void)
+{
+    return PACKAGE_VERSION MESA_GIT_SHA1;
+}
diff --git a/src/gallium/frontends/rusticl/rusticl_system_bindings.h b/src/gallium/frontends/rusticl/rusticl_system_bindings.h
index b509a24b8e27d..5856946ab1533 100644
--- a/src/gallium/frontends/rusticl/rusticl_system_bindings.h
+++ b/src/gallium/frontends/rusticl/rusticl_system_bindings.h
@@ -2,3 +2,5 @@
 
 FILE *stdout_ptr(void);
 FILE *stderr_ptr(void);
+
+const char* mesa_version_string(void);