diff options
| -rw-r--r-- | src/glsl/nir/nir.h | 2 | ||||
| -rw-r--r-- | src/mesa/Makefile.sources | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_live_variables.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_performance_monitor.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_live_variables.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_context.h | 2 | ||||
| -rw-r--r-- | src/mesa/main/performance_monitor.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/texstate.c | 2 | ||||
| -rw-r--r-- | src/util/Makefile.sources | 1 | ||||
| -rw-r--r-- | src/util/bitset.h (renamed from src/mesa/main/bitset.h) | 0 | ||||
| -rw-r--r-- | src/util/register_allocate.c | 2 |
12 files changed, 10 insertions, 10 deletions
diff --git a/src/glsl/nir/nir.h b/src/glsl/nir/nir.h index a109f0fa297..17b8b4b97c9 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 b5912b76a34..5b4e71253e3 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 e265ce0fd8c..764741d369e 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 a9b61aa39e5..c7457069ede 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 e683e40e55f..f4d4577b74e 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 5e6838367dd..e9d9fa18d0a 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 8ea431bfa48..b6cbde44ac6 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 c02910e314e..2d740daf019 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 66fd7183e3b..99c7c81788a 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 1e29a032e22..560ea836aa1 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 17c5d5d252a..17c5d5d252a 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 af7a20c0982..684ee5d6cf5 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 |