From b53d035825ef3ad680470aa5c4f9dc51f8f5676b Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 11 Feb 2015 15:05:06 -0800 Subject: [PATCH] util: Move Mesa's bitset.h to util/. Reviewed-by: Jose Fonseca --- src/glsl/nir/nir.h | 2 +- src/mesa/Makefile.sources | 1 - src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp | 2 +- src/mesa/drivers/dri/i965/brw_fs_live_variables.h | 2 +- src/mesa/drivers/dri/i965/brw_performance_monitor.c | 2 +- src/mesa/drivers/dri/i965/brw_vec4_live_variables.h | 2 +- src/mesa/drivers/dri/nouveau/nouveau_context.h | 2 +- src/mesa/main/performance_monitor.c | 2 +- src/mesa/main/texstate.c | 2 +- src/util/Makefile.sources | 1 + src/{mesa/main => util}/bitset.h | 0 src/util/register_allocate.c | 2 +- 12 files changed, 10 insertions(+), 10 deletions(-) rename src/{mesa/main => util}/bitset.h (100%) diff --git a/src/glsl/nir/nir.h b/src/glsl/nir/nir.h index a109f0f..17b8b4b 100644 --- a/src/glsl/nir/nir.h +++ b/src/glsl/nir/nir.h @@ -33,7 +33,7 @@ #include "util/ralloc.h" #include "util/set.h" #include "main/mtypes.h" -#include "main/bitset.h" +#include "util/bitset.h" #include "nir_types.h" #include diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources index b5912b7..5b4e712 100644 --- a/src/mesa/Makefile.sources +++ b/src/mesa/Makefile.sources @@ -24,7 +24,6 @@ MAIN_FILES = \ main/atifragshader.h \ main/attrib.c \ main/attrib.h \ - main/bitset.h \ main/blend.c \ main/blend.h \ main/blit.c \ diff --git a/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp b/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp index e265ce0..764741d 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp @@ -34,7 +34,7 @@ #define ACP_HASH_SIZE 16 -#include "main/bitset.h" +#include "util/bitset.h" #include "brw_fs.h" #include "brw_cfg.h" diff --git a/src/mesa/drivers/dri/i965/brw_fs_live_variables.h b/src/mesa/drivers/dri/i965/brw_fs_live_variables.h index a9b61aa..c745706 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_live_variables.h +++ b/src/mesa/drivers/dri/i965/brw_fs_live_variables.h @@ -26,7 +26,7 @@ */ #include "brw_fs.h" -#include "main/bitset.h" +#include "util/bitset.h" struct cfg_t; diff --git a/src/mesa/drivers/dri/i965/brw_performance_monitor.c b/src/mesa/drivers/dri/i965/brw_performance_monitor.c index e683e40..f4d4577 100644 --- a/src/mesa/drivers/dri/i965/brw_performance_monitor.c +++ b/src/mesa/drivers/dri/i965/brw_performance_monitor.c @@ -44,7 +44,7 @@ #include -#include "main/bitset.h" +#include "util/bitset.h" #include "main/hash.h" #include "main/macros.h" #include "main/mtypes.h" diff --git a/src/mesa/drivers/dri/i965/brw_vec4_live_variables.h b/src/mesa/drivers/dri/i965/brw_vec4_live_variables.h index 5e68383..e9d9fa1 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_live_variables.h +++ b/src/mesa/drivers/dri/i965/brw_vec4_live_variables.h @@ -25,7 +25,7 @@ * */ -#include "main/bitset.h" +#include "util/bitset.h" #include "brw_vec4.h" namespace brw { diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.h b/src/mesa/drivers/dri/nouveau/nouveau_context.h index 8ea431b..b6cbde4 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_context.h +++ b/src/mesa/drivers/dri/nouveau/nouveau_context.h @@ -32,7 +32,7 @@ #include "nouveau_scratch.h" #include "nouveau_render.h" -#include "main/bitset.h" +#include "util/bitset.h" enum nouveau_fallback { HWTNL = 0, diff --git a/src/mesa/main/performance_monitor.c b/src/mesa/main/performance_monitor.c index c02910e..2d740da 100644 --- a/src/mesa/main/performance_monitor.c +++ b/src/mesa/main/performance_monitor.c @@ -42,7 +42,7 @@ #include "macros.h" #include "mtypes.h" #include "performance_monitor.h" -#include "bitset.h" +#include "util/bitset.h" #include "util/ralloc.h" void diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index 66fd718..99c7c81 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -40,7 +40,7 @@ #include "teximage.h" #include "texstate.h" #include "mtypes.h" -#include "bitset.h" +#include "util/bitset.h" /** diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources index 1e29a03..560ea83 100644 --- a/src/util/Makefile.sources +++ b/src/util/Makefile.sources @@ -3,6 +3,7 @@ MESA_UTIL_SHADER_CACHE_FILES := \ mesa-sha1.h MESA_UTIL_FILES := \ + bitset.h \ format_srgb.h \ hash_table.c \ hash_table.h \ diff --git a/src/mesa/main/bitset.h b/src/util/bitset.h similarity index 100% rename from src/mesa/main/bitset.h rename to src/util/bitset.h diff --git a/src/util/register_allocate.c b/src/util/register_allocate.c index af7a20c..684ee5d 100644 --- a/src/util/register_allocate.c +++ b/src/util/register_allocate.c @@ -76,7 +76,7 @@ #include "main/imports.h" #include "main/macros.h" #include "main/mtypes.h" -#include "main/bitset.h" +#include "util/bitset.h" #include "register_allocate.h" #define NO_REG ~0U -- 2.7.4