Mesa (master): util: Move os_misc to util
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Oct 30 21:59:22 UTC 2018
Module: Mesa
Branch: master
Commit: 2fd5dff7e7348cce46318ee0db913948968ded2a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2fd5dff7e7348cce46318ee0db913948968ded2a
Author: Dylan Baker <dylan at pnwbakers.com>
Date: Mon Oct 29 11:21:07 2018 -0700
util: Move os_misc to util
this is needed by u_debug
Tested-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
---
src/gallium/auxiliary/Makefile.sources | 2 --
src/gallium/auxiliary/meson.build | 2 --
src/gallium/auxiliary/util/u_debug.h | 2 +-
src/gallium/drivers/i915/i915_screen.c | 2 +-
src/gallium/drivers/llvmpipe/lp_screen.c | 2 +-
src/gallium/drivers/softpipe/sp_screen.c | 2 +-
src/gallium/drivers/v3d/v3d_screen.c | 2 +-
src/gallium/drivers/vc4/vc4_screen.c | 2 +-
src/util/Makefile.sources | 2 ++
src/util/meson.build | 2 ++
src/{gallium/auxiliary/os => util}/os_misc.c | 0
src/{gallium/auxiliary/os => util}/os_misc.h | 0
12 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
index 923ffb2383..75df7d0717 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -106,8 +106,6 @@ C_SOURCES := \
os/os_memory_debug.h \
os/os_memory_stdc.h \
os/os_memory.h \
- os/os_misc.c \
- os/os_misc.h \
os/os_mman.h \
os/os_process.c \
os/os_process.h \
diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build
index 656955c621..9c158b6b37 100644
--- a/src/gallium/auxiliary/meson.build
+++ b/src/gallium/auxiliary/meson.build
@@ -126,8 +126,6 @@ files_libgallium = files(
'os/os_memory_debug.h',
'os/os_memory_stdc.h',
'os/os_memory.h',
- 'os/os_misc.c',
- 'os/os_misc.h',
'os/os_mman.h',
'os/os_process.c',
'os/os_process.h',
diff --git a/src/gallium/auxiliary/util/u_debug.h b/src/gallium/auxiliary/util/u_debug.h
index bd946e6b01..b3505caebf 100644
--- a/src/gallium/auxiliary/util/u_debug.h
+++ b/src/gallium/auxiliary/util/u_debug.h
@@ -39,7 +39,7 @@
#define U_DEBUG_H_
-#include "os/os_misc.h"
+#include "util/os_misc.h"
#if defined(PIPE_OS_HAIKU)
/* Haiku provides debug_printf in libroot with OS.h */
diff --git a/src/gallium/drivers/i915/i915_screen.c b/src/gallium/drivers/i915/i915_screen.c
index 169f502f05..a7b4a43c01 100644
--- a/src/gallium/drivers/i915/i915_screen.c
+++ b/src/gallium/drivers/i915/i915_screen.c
@@ -27,7 +27,7 @@
#include "draw/draw_context.h"
-#include "os/os_misc.h"
+#include "util/os_misc.h"
#include "util/u_format.h"
#include "util/u_format_s3tc.h"
#include "util/u_inlines.h"
diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
index f706bf9c9c..c95016a6cb 100644
--- a/src/gallium/drivers/llvmpipe/lp_screen.c
+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
@@ -38,7 +38,7 @@
#include "draw/draw_context.h"
#include "gallivm/lp_bld_type.h"
-#include "os/os_misc.h"
+#include "util/os_misc.h"
#include "util/os_time.h"
#include "lp_texture.h"
#include "lp_fence.h"
diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
index bd8f655838..44e48cc7ee 100644
--- a/src/gallium/drivers/softpipe/sp_screen.c
+++ b/src/gallium/drivers/softpipe/sp_screen.c
@@ -31,7 +31,7 @@
#include "util/u_format_s3tc.h"
#include "util/u_screen.h"
#include "util/u_video.h"
-#include "os/os_misc.h"
+#include "util/os_misc.h"
#include "util/os_time.h"
#include "pipe/p_defines.h"
#include "pipe/p_screen.h"
diff --git a/src/gallium/drivers/v3d/v3d_screen.c b/src/gallium/drivers/v3d/v3d_screen.c
index 5a8400dcf0..1d59dbfc12 100644
--- a/src/gallium/drivers/v3d/v3d_screen.c
+++ b/src/gallium/drivers/v3d/v3d_screen.c
@@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
-#include "os/os_misc.h"
+#include "util/os_misc.h"
#include "pipe/p_defines.h"
#include "pipe/p_screen.h"
#include "pipe/p_state.h"
diff --git a/src/gallium/drivers/vc4/vc4_screen.c b/src/gallium/drivers/vc4/vc4_screen.c
index 13fd5ac544..14ee6cf09e 100644
--- a/src/gallium/drivers/vc4/vc4_screen.c
+++ b/src/gallium/drivers/vc4/vc4_screen.c
@@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
-#include "os/os_misc.h"
+#include "util/os_misc.h"
#include "pipe/p_defines.h"
#include "pipe/p_screen.h"
#include "pipe/p_state.h"
diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources
index e8558f561f..b1dad51cbe 100644
--- a/src/util/Makefile.sources
+++ b/src/util/Makefile.sources
@@ -27,6 +27,8 @@ MESA_UTIL_FILES := \
mesa-sha1.h \
os_time.c \
os_time.h \
+ os_misc.c \
+ os_misc.h \
u_process.c \
u_process.h \
sha1/sha1.c \
diff --git a/src/util/meson.build b/src/util/meson.build
index 49d84c16eb..cf173ee2bd 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -51,6 +51,8 @@ files_mesa_util = files(
'mesa-sha1.h',
'os_time.c',
'os_time.h',
+ 'os_misc.c',
+ 'os_misc.h',
'u_process.c',
'u_process.h',
'sha1/sha1.c',
diff --git a/src/gallium/auxiliary/os/os_misc.c b/src/util/os_misc.c
similarity index 100%
rename from src/gallium/auxiliary/os/os_misc.c
rename to src/util/os_misc.c
diff --git a/src/gallium/auxiliary/os/os_misc.h b/src/util/os_misc.h
similarity index 100%
rename from src/gallium/auxiliary/os/os_misc.h
rename to src/util/os_misc.h
More information about the mesa-commit
mailing list