Mesa (main): gallium/util: Move u_dl and u_pointer to src/util

[GitLab Mirror]

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

Author: Jesse Natalie <jenatali at microsoft.com>
Date:   Thu Jun 30 19:25:19 2022 -0700

gallium/util: Move u_dl and u_pointer to src/util

Reviewed-by: Eric Engestrom <eric at igalia.com>
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17327>

---

 src/gallium/auxiliary/meson.build            |  3 ---
 src/util/meson.build                         |  3 +++
 src/{gallium/auxiliary => }/util/u_dl.c      | 23 +++++++++++------------
 src/{gallium/auxiliary => }/util/u_dl.h      |  6 +++---
 src/{gallium/auxiliary => }/util/u_pointer.h |  2 +-
 5 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build
index 2f1fc111309..2a2b2a56e50 100644
--- a/src/gallium/auxiliary/meson.build
+++ b/src/gallium/auxiliary/meson.build
@@ -238,8 +238,6 @@ files_libgallium = files(
   'util/u_debug_image.h',
   'util/u_dirty_flags.h',
   'util/u_dirty_surfaces.h',
-  'util/u_dl.c',
-  'util/u_dl.h',
   'util/u_draw.c',
   'util/u_draw.h',
   'util/u_draw_quad.c',
@@ -270,7 +268,6 @@ files_libgallium = files(
   'util/u_network.c',
   'util/u_network.h',
   'util/u_pack_color.h',
-  'util/u_pointer.h',
   'util/u_prim.h',
   'util/u_prim.c',
   'util/u_prim_restart.c',
diff --git a/src/util/meson.build b/src/util/meson.build
index 6cb2a5323ad..aa12c6e8e6a 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -122,11 +122,14 @@ files_mesa_util = files(
   'u_debug_describe.h',
   'u_debug_refcnt.c',
   'u_debug_refcnt.h',
+  'u_dl.c',
+  'u_dl.h',
   'u_dynarray.h',
   'u_endian.h',
   'u_fifo.h',
   'u_hash_table.c',
   'u_hash_table.h',
+  'u_pointer.h',
   'u_queue.c',
   'u_queue.h',
   'u_string.h',
diff --git a/src/gallium/auxiliary/util/u_dl.c b/src/util/u_dl.c
similarity index 87%
rename from src/gallium/auxiliary/util/u_dl.c
rename to src/util/u_dl.c
index 9b97d8dc4b9..c0c0cbccbc6 100644
--- a/src/gallium/auxiliary/util/u_dl.c
+++ b/src/util/u_dl.c
@@ -27,13 +27,12 @@
  **************************************************************************/
 
 
-#include "pipe/p_config.h"
-#include "pipe/p_compiler.h"
+#include "detect_os.h"
 
-#if defined(PIPE_OS_UNIX)
+#if DETECT_OS_UNIX
 #include <dlfcn.h>
 #endif
-#if defined(PIPE_OS_WINDOWS)
+#if DETECT_OS_WINDOWS
 #include <windows.h>
 #endif
 
@@ -44,9 +43,9 @@
 struct util_dl_library *
 util_dl_open(const char *filename)
 {
-#if defined(PIPE_OS_UNIX)
+#if DETECT_OS_UNIX
    return (struct util_dl_library *)dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
-#elif defined(PIPE_OS_WINDOWS)
+#elif DETECT_OS_WINDOWS
    return (struct util_dl_library *)LoadLibraryA(filename);
 #else
    return NULL;
@@ -58,9 +57,9 @@ util_dl_proc
 util_dl_get_proc_address(struct util_dl_library *library,
                          const char *procname)
 {
-#if defined(PIPE_OS_UNIX)
+#if DETECT_OS_UNIX
    return (util_dl_proc) pointer_to_func(dlsym((void *)library, procname));
-#elif defined(PIPE_OS_WINDOWS)
+#elif DETECT_OS_WINDOWS
    return (util_dl_proc)GetProcAddress((HMODULE)library, procname);
 #else
    return (util_dl_proc)NULL;
@@ -71,9 +70,9 @@ util_dl_get_proc_address(struct util_dl_library *library,
 void
 util_dl_close(struct util_dl_library *library)
 {
-#if defined(PIPE_OS_UNIX)
+#if DETECT_OS_UNIX
    dlclose((void *)library);
-#elif defined(PIPE_OS_WINDOWS)
+#elif DETECT_OS_WINDOWS
    FreeLibrary((HMODULE)library);
 #else
    (void)library;
@@ -84,9 +83,9 @@ util_dl_close(struct util_dl_library *library)
 const char *
 util_dl_error(void)
 {
-#if defined(PIPE_OS_UNIX)
+#if DETECT_OS_UNIX
    return dlerror();
-#elif defined(PIPE_OS_WINDOWS)
+#elif DETECT_OS_WINDOWS
    return "unknown error";
 #else
    return "unknown error";
diff --git a/src/gallium/auxiliary/util/u_dl.h b/src/util/u_dl.h
similarity index 96%
rename from src/gallium/auxiliary/util/u_dl.h
rename to src/util/u_dl.h
index 2f5c35167c0..03e53f804e7 100644
--- a/src/gallium/auxiliary/util/u_dl.h
+++ b/src/util/u_dl.h
@@ -30,16 +30,16 @@
 #define U_DL_H_
 
 
-#include "pipe/p_config.h"
+#include "detect_os.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if defined(PIPE_OS_WINDOWS)
+#if DETECT_OS_WINDOWS
 #  define UTIL_DL_EXT ".dll"
 #  define UTIL_DL_PREFIX ""
-#elif defined(PIPE_OS_APPLE)
+#elif DETECT_OS_APPLE
 #  define UTIL_DL_EXT ".dylib"
 #  define UTIL_DL_PREFIX "lib"
 #else
diff --git a/src/gallium/auxiliary/util/u_pointer.h b/src/util/u_pointer.h
similarity index 98%
rename from src/gallium/auxiliary/util/u_pointer.h
rename to src/util/u_pointer.h
index 4f7a27ca61d..e106eb2b814 100644
--- a/src/gallium/auxiliary/util/u_pointer.h
+++ b/src/util/u_pointer.h
@@ -28,7 +28,7 @@
 #ifndef U_POINTER_H
 #define U_POINTER_H
 
-#include "pipe/p_compiler.h"
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {