Mesa (main): streaming-memcpy: move to src/util/ and compile unconditionally

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Thu Jun  2 10:02:57 2022 -0400

streaming-memcpy: move to src/util/ and compile unconditionally

this is useful, so make it available for general use

Reviewed-by: Emma Anholt <emma at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16732>

---

 src/mesa/meson.build                            |  2 +-
 src/util/meson.build                            | 10 +++++++++-
 src/{mesa/main => util}/streaming-load-memcpy.c |  4 ++--
 src/{mesa/main => util}/streaming-load-memcpy.h |  2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/mesa/meson.build b/src/mesa/meson.build
index 8fba301efc5..9239d8755e3 100644
--- a/src/mesa/meson.build
+++ b/src/mesa/meson.build
@@ -466,7 +466,7 @@ files_libmesa += [
 if with_sse41
   libmesa_sse41 = static_library(
     'mesa_sse41',
-    files('main/streaming-load-memcpy.c', 'main/sse_minmax.c'),
+    files('main/sse_minmax.c'),
     c_args : [c_msvc_compat_args, sse41_args],
     include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
     gnu_symbol_visibility : 'hidden',
diff --git a/src/util/meson.build b/src/util/meson.build
index cbac00e5c31..5b60a5d7675 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -249,12 +249,20 @@ u_unfilled_gen_c = custom_target(
   capture : true,
 )
 
+libmesa_util_sse41 = static_library(
+		'mesa_util_sse41',
+		files('streaming-load-memcpy.c'),
+		c_args : [c_msvc_compat_args, sse41_args],
+		include_directories : [inc_include, inc_src, inc_mesa],
+		gnu_symbol_visibility : 'hidden',
+)
+
 _libmesa_util = static_library(
   'mesa_util',
   [files_mesa_util, files_debug_stack, format_srgb, u_indices_gen_c, u_unfilled_gen_c],
   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies : deps_for_libmesa_util,
-  link_with: libmesa_format,
+  link_with: [libmesa_format, libmesa_util_sse41],
   c_args : [c_msvc_compat_args],
   gnu_symbol_visibility : 'hidden',
   build_by_default : false
diff --git a/src/mesa/main/streaming-load-memcpy.c b/src/util/streaming-load-memcpy.c
similarity index 96%
rename from src/mesa/main/streaming-load-memcpy.c
rename to src/util/streaming-load-memcpy.c
index 376bfd87c4f..62b5f03e8c4 100644
--- a/src/mesa/main/streaming-load-memcpy.c
+++ b/src/util/streaming-load-memcpy.c
@@ -27,7 +27,7 @@
  */
 
 #include "main/macros.h"
-#include "main/streaming-load-memcpy.h"
+#include "util/streaming-load-memcpy.h"
 #include "x86/common_x86_asm.h"
 #ifdef USE_SSE41
 #include <smmintrin.h>
@@ -37,7 +37,7 @@
  * read performance from uncached memory.
  */
 void
-_mesa_streaming_load_memcpy(void *restrict dst, void *restrict src, size_t len)
+util_streaming_load_memcpy(void *restrict dst, void *restrict src, size_t len)
 {
    char *restrict d = dst;
    char *restrict s = src;
diff --git a/src/mesa/main/streaming-load-memcpy.h b/src/util/streaming-load-memcpy.h
similarity index 94%
rename from src/mesa/main/streaming-load-memcpy.h
rename to src/util/streaming-load-memcpy.h
index 9ecb685d660..ee277b0860b 100644
--- a/src/mesa/main/streaming-load-memcpy.h
+++ b/src/util/streaming-load-memcpy.h
@@ -36,6 +36,6 @@
 #include <stdlib.h>
 
 void
-_mesa_streaming_load_memcpy(void *restrict dst, void *restrict src, size_t len);
+util_streaming_load_memcpy(void *restrict dst, void *restrict src, size_t len);
 
 #endif /* STREAMING_LOAD_MEMCPY_H */