From 660b110494960d3d82712775bf4f2796e20f219c Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Thu, 10 Nov 2022 19:25:01 +0800 Subject: [PATCH] util: Move src/gallium/auxiliary/os/os_mman.h to src/util/os_mman.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use "util/detect_os.h" instead of "pipe/p_config.h" and "pipe/p_compiler.h" in src/util/os_mman.h This is a prepare to implement os_mman on windows Signed-off-by: Yonggang Luo Reviewed-by: Marek Olšák Part-of: --- src/etnaviv/drm/etnaviv_bo.c | 2 +- src/freedreno/drm/freedreno_bo.c | 2 +- src/gallium/auxiliary/meson.build | 1 - src/gallium/drivers/iris/iris_bufmgr.c | 2 +- src/gallium/drivers/lima/lima_bo.c | 2 +- src/gallium/drivers/nouveau/nouveau_screen.c | 2 +- src/gallium/winsys/radeon/drm/radeon_drm_bo.c | 2 +- src/gallium/winsys/svga/drm/vmw_screen_ioctl.c | 2 +- src/gallium/winsys/virgl/drm/virgl_drm_winsys.c | 2 +- src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c | 2 +- src/panfrost/lib/pan_bo.c | 2 +- src/{gallium/auxiliary/os => util}/os_mman.h | 13 +++++++------ 12 files changed, 17 insertions(+), 17 deletions(-) rename src/{gallium/auxiliary/os => util}/os_mman.h (90%) diff --git a/src/etnaviv/drm/etnaviv_bo.c b/src/etnaviv/drm/etnaviv_bo.c index d790823bcb7..2bf4357e63a 100644 --- a/src/etnaviv/drm/etnaviv_bo.c +++ b/src/etnaviv/drm/etnaviv_bo.c @@ -24,7 +24,7 @@ * Christian Gmeiner */ -#include "os/os_mman.h" +#include "util/os_mman.h" #include "util/hash_table.h" #include "etnaviv_priv.h" diff --git a/src/freedreno/drm/freedreno_bo.c b/src/freedreno/drm/freedreno_bo.c index 78285108d5a..ba61c94810d 100644 --- a/src/freedreno/drm/freedreno_bo.c +++ b/src/freedreno/drm/freedreno_bo.c @@ -24,7 +24,7 @@ * Rob Clark */ -#include "os/os_mman.h" +#include "util/os_mman.h" #include "freedreno_drmif.h" #include "freedreno_priv.h" diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build index 929baacab9d..ee623962a4b 100644 --- a/src/gallium/auxiliary/meson.build +++ b/src/gallium/auxiliary/meson.build @@ -112,7 +112,6 @@ files_libgallium = files( 'hud/hud_driver_query.c', 'hud/hud_fps.c', 'hud/hud_private.h', - 'os/os_mman.h', 'os/os_process.h', 'pipebuffer/pb_buffer_fenced.c', 'pipebuffer/pb_buffer_fenced.h', diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c index b01d0fa0134..801e0f5e9ff 100644 --- a/src/gallium/drivers/iris/iris_bufmgr.c +++ b/src/gallium/drivers/iris/iris_bufmgr.c @@ -54,7 +54,7 @@ #include "common/intel_gem.h" #include "dev/intel_device_info.h" #include "isl/isl.h" -#include "os/os_mman.h" +#include "util/os_mman.h" #include "util/u_debug.h" #include "util/macros.h" #include "util/hash_table.h" diff --git a/src/gallium/drivers/lima/lima_bo.c b/src/gallium/drivers/lima/lima_bo.c index 9e6d46b05de..e2daba76b69 100644 --- a/src/gallium/drivers/lima/lima_bo.c +++ b/src/gallium/drivers/lima/lima_bo.c @@ -32,7 +32,7 @@ #include "util/u_hash_table.h" #include "util/u_math.h" #include "util/os_time.h" -#include "os/os_mman.h" +#include "util/os_mman.h" #include "frontend/drm_driver.h" diff --git a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c index bdd2b903dab..f32531312ba 100644 --- a/src/gallium/drivers/nouveau/nouveau_screen.c +++ b/src/gallium/drivers/nouveau/nouveau_screen.c @@ -8,7 +8,7 @@ #include "util/format/u_format_s3tc.h" #include "util/u_string.h" -#include "os/os_mman.h" +#include "util/os_mman.h" #include "util/os_time.h" #include diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c index 48af758cc02..bafc6983367 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c @@ -29,7 +29,7 @@ #include "util/u_hash_table.h" #include "util/u_memory.h" #include "util/u_thread.h" -#include "os/os_mman.h" +#include "util/os_mman.h" #include "util/os_time.h" #include "frontend/drm_driver.h" diff --git a/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c b/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c index 7b83cbce26d..1d545b52838 100644 --- a/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c +++ b/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c @@ -46,7 +46,7 @@ #include "svga3d_caps.h" #include "svga3d_reg.h" -#include "os/os_mman.h" +#include "util/os_mman.h" #include #include diff --git a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c index 9c1137ada49..6ae63e75758 100644 --- a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c +++ b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c @@ -28,7 +28,7 @@ #include #include -#include "os/os_mman.h" +#include "util/os_mman.h" #include "util/os_file.h" #include "util/os_time.h" #include "util/u_memory.h" diff --git a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c index b69b9ceee16..ede5b6894ee 100644 --- a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c +++ b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c @@ -27,7 +27,7 @@ #include "util/u_inlines.h" #include "util/os_time.h" #include "frontend/sw_winsys.h" -#include "os/os_mman.h" +#include "util/os_mman.h" #include "virgl_vtest_winsys.h" #include "virgl_vtest_public.h" diff --git a/src/panfrost/lib/pan_bo.c b/src/panfrost/lib/pan_bo.c index 80aaf269580..b606d1b0359 100644 --- a/src/panfrost/lib/pan_bo.c +++ b/src/panfrost/lib/pan_bo.c @@ -35,7 +35,7 @@ #include "pan_util.h" #include "wrap.h" -#include "os/os_mman.h" +#include "util/os_mman.h" #include "util/u_inlines.h" #include "util/u_math.h" diff --git a/src/gallium/auxiliary/os/os_mman.h b/src/util/os_mman.h similarity index 90% rename from src/gallium/auxiliary/os/os_mman.h rename to src/util/os_mman.h index 1d07ce654a0..9b0e45e8cdb 100644 --- a/src/gallium/auxiliary/os/os_mman.h +++ b/src/util/os_mman.h @@ -35,11 +35,12 @@ #ifndef _OS_MMAN_H_ #define _OS_MMAN_H_ +#include +#include -#include "pipe/p_config.h" -#include "pipe/p_compiler.h" +#include "util/detect_os.h" -#if defined(PIPE_OS_UNIX) +#if DETECT_OS_UNIX # include #else # error Unsupported OS @@ -50,7 +51,7 @@ extern "C" { #endif -#if defined(PIPE_OS_ANDROID) && !defined(__LP64__) +#if DETECT_OS_ANDROID && !defined(__LP64__) /* 32-bit needs mmap64 for 64-bit offsets */ # define os_mmap(addr, length, prot, flags, fd, offset) \ mmap64(addr, length, prot, flags, fd, offset) @@ -68,8 +69,8 @@ static inline int os_munmap(void *addr, size_t length) /* Copied from configure code generated by AC_SYS_LARGEFILE */ #define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + \ (((off_t) 1 << 31) << 31)) - STATIC_ASSERT(LARGE_OFF_T % 2147483629 == 721 && - LARGE_OFF_T % 2147483647 == 1); + static_assert(LARGE_OFF_T % 2147483629 == 721 && + LARGE_OFF_T % 2147483647 == 1, ""); #undef LARGE_OFF_T return munmap(addr, length);