From 518e21ab875e357aff2c52d7e7f53589e337fbb1 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Mon, 7 Nov 2022 15:14:47 +0800 Subject: [PATCH] util: Remove include "pipe/*.h" in src/util/* files MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Yonggang Luo Reviewed-by: Marek Olšák Part-of: --- src/util/format/u_format.c | 4 ---- src/util/format/u_format.h | 5 ----- src/util/u_hash_table.h | 3 ++- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/util/format/u_format.c b/src/util/format/u_format.c index 17e58b8..920d217 100644 --- a/src/util/format/u_format.c +++ b/src/util/format/u_format.c @@ -38,10 +38,6 @@ #include "util/format/u_format_s3tc.h" #include "util/u_math.h" -#include "pipe/p_defines.h" -#include "pipe/p_screen.h" - - /** * Copy 2D rect from one place to another. * Position and sizes are in pixels. diff --git a/src/util/format/u_format.h b/src/util/format/u_format.h index 011eeb0..982ae3e 100644 --- a/src/util/format/u_format.h +++ b/src/util/format/u_format.h @@ -31,15 +31,10 @@ #include "util/format/u_formats.h" -#include "pipe/p_defines.h" #include "util/u_debug.h" #include "c99_compat.h" -union pipe_color_union; -struct pipe_screen; - - #ifdef __cplusplus extern "C" { #endif diff --git a/src/util/u_hash_table.h b/src/util/u_hash_table.h index 058ecec..4e711de8 100644 --- a/src/util/u_hash_table.h +++ b/src/util/u_hash_table.h @@ -33,8 +33,9 @@ #define U_HASH_TABLE_H_ -#include "pipe/p_defines.h" +#include "util/detect.h" #include "util/hash_table.h" +#include "util/macros.h" #ifdef __cplusplus -- 2.7.4