summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2015-02-11 15:05:06 -0800
committerEric Anholt <eric@anholt.net>2015-02-20 11:36:34 -0800
commitb53d035825ef3ad680470aa5c4f9dc51f8f5676b (patch)
tree25ebc310a0eb426f9bf815d12dc44d4ad6db54ff
parent8aa381e3cd848f051931f86af5fdcd59921916ee (diff)
downloadexternal_mesa3d-b53d035825ef3ad680470aa5c4f9dc51f8f5676b.zip
external_mesa3d-b53d035825ef3ad680470aa5c4f9dc51f8f5676b.tar.gz
external_mesa3d-b53d035825ef3ad680470aa5c4f9dc51f8f5676b.tar.bz2
util: Move Mesa's bitset.h to util/.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
-rw-r--r--src/glsl/nir/nir.h2
-rw-r--r--src/mesa/Makefile.sources1
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp2
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs_live_variables.h2
-rw-r--r--src/mesa/drivers/dri/i965/brw_performance_monitor.c2
-rw-r--r--src/mesa/drivers/dri/i965/brw_vec4_live_variables.h2
-rw-r--r--src/mesa/drivers/dri/nouveau/nouveau_context.h2
-rw-r--r--src/mesa/main/performance_monitor.c2
-rw-r--r--src/mesa/main/texstate.c2
-rw-r--r--src/util/Makefile.sources1
-rw-r--r--src/util/bitset.h (renamed from src/mesa/main/bitset.h)0
-rw-r--r--src/util/register_allocate.c2
12 files changed, 10 insertions, 10 deletions
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 <stdio.h>
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 <limits.h>
-#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
index 17c5d5d..17c5d5d 100644
--- a/src/mesa/main/bitset.h
+++ b/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