diff options
| author | Jason Ekstrand <[email protected]> | 2016-08-03 09:16:12 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-08-05 09:06:31 -0700 |
| commit | 6c665cdfc5d9eca2136f87e10eb80a6c59d5156f (patch) | |
| tree | c1c1256de89f2785008258f74ab206c6a21d2865 | |
| parent | 591869e92100fdc8663e869c7bcda338875d4265 (diff) | |
util: Move format_rgb9e5.h to src/util
It's used from both mesa main and gallium.
Signed-off-by: Jason Ekstrand <[email protected]>
Reviewed-by: Roland Scheidegger <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/Makefile.sources | 1 | ||||
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_format_other.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/format_pack.py | 2 | ||||
| -rw-r--r-- | src/mesa/main/format_unpack.py | 2 | ||||
| -rw-r--r-- | src/mesa/main/mipmap.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/texstore.c | 2 | ||||
| -rw-r--r-- | src/mesa/swrast/s_texfetch.c | 2 | ||||
| -rw-r--r-- | src/util/Makefile.sources | 1 | ||||
| -rw-r--r-- | src/util/format_rgb9e5.h (renamed from src/gallium/auxiliary/util/u_format_rgb9e5.h) | 0 |
10 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources index 26f7eee365b..230f52beec8 100644 --- a/src/gallium/auxiliary/Makefile.sources +++ b/src/gallium/auxiliary/Makefile.sources @@ -229,7 +229,6 @@ C_SOURCES := \ util/u_format_other.c \ util/u_format_other.h \ util/u_format_r11g11b10f.h \ - util/u_format_rgb9e5.h \ util/u_format_rgtc.c \ util/u_format_rgtc.h \ util/u_format_s3tc.c \ diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c index 3a8327d8305..1b48fc2a91e 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c @@ -42,7 +42,7 @@ #include "util/u_math.h" #include "util/u_format.h" #include "util/u_cpu_detect.h" -#include "util/u_format_rgb9e5.h" +#include "util/format_rgb9e5.h" #include "lp_bld_debug.h" #include "lp_bld_type.h" #include "lp_bld_const.h" diff --git a/src/gallium/auxiliary/util/u_format_other.c b/src/gallium/auxiliary/util/u_format_other.c index 20752d469a0..81978355f94 100644 --- a/src/gallium/auxiliary/util/u_format_other.c +++ b/src/gallium/auxiliary/util/u_format_other.c @@ -28,7 +28,7 @@ #include "u_math.h" #include "u_format_other.h" -#include "u_format_rgb9e5.h" +#include "util/format_rgb9e5.h" #include "u_format_r11g11b10f.h" diff --git a/src/mesa/main/format_pack.py b/src/mesa/main/format_pack.py index 2f43a30ddd8..4d45b09d105 100644 --- a/src/mesa/main/format_pack.py +++ b/src/mesa/main/format_pack.py @@ -46,7 +46,7 @@ string = """/* #include "format_pack.h" #include "format_utils.h" #include "macros.h" -#include "../../gallium/auxiliary/util/u_format_rgb9e5.h" +#include "util/format_rgb9e5.h" #include "../../gallium/auxiliary/util/u_format_r11g11b10f.h" #include "util/format_srgb.h" diff --git a/src/mesa/main/format_unpack.py b/src/mesa/main/format_unpack.py index 0ae73b8970a..fc7ea3b4ab7 100644 --- a/src/mesa/main/format_unpack.py +++ b/src/mesa/main/format_unpack.py @@ -46,7 +46,7 @@ string = """/* #include "format_unpack.h" #include "format_utils.h" #include "macros.h" -#include "../../gallium/auxiliary/util/u_format_rgb9e5.h" +#include "util/format_rgb9e5.h" #include "../../gallium/auxiliary/util/u_format_r11g11b10f.h" #include "util/format_srgb.h" diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c index 996e3f83291..d8fa30544fe 100644 --- a/src/mesa/main/mipmap.c +++ b/src/mesa/main/mipmap.c @@ -38,7 +38,7 @@ #include "image.h" #include "macros.h" #include "util/half_float.h" -#include "../../gallium/auxiliary/util/u_format_rgb9e5.h" +#include "util/format_rgb9e5.h" #include "../../gallium/auxiliary/util/u_format_r11g11b10f.h" diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index b54e0333749..3c391acaa1d 100644 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -73,7 +73,7 @@ #include "enums.h" #include "glformats.h" #include "pixeltransfer.h" -#include "../../gallium/auxiliary/util/u_format_rgb9e5.h" +#include "util/format_rgb9e5.h" #include "../../gallium/auxiliary/util/u_format_r11g11b10f.h" diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c index 721d0883853..6856129588e 100644 --- a/src/mesa/swrast/s_texfetch.c +++ b/src/mesa/swrast/s_texfetch.c @@ -43,7 +43,7 @@ #include "main/samplerobj.h" #include "s_context.h" #include "s_texfetch.h" -#include "../../gallium/auxiliary/util/u_format_rgb9e5.h" +#include "util/format_rgb9e5.h" #include "../../gallium/auxiliary/util/u_format_r11g11b10f.h" #include "util/format_srgb.h" diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources index aec41c389ea..6bf01437a8b 100644 --- a/src/util/Makefile.sources +++ b/src/util/Makefile.sources @@ -4,6 +4,7 @@ MESA_UTIL_FILES := \ bitset.h \ debug.c \ debug.h \ + format_rgb9e5.h \ format_srgb.h \ half_float.c \ half_float.h \ diff --git a/src/gallium/auxiliary/util/u_format_rgb9e5.h b/src/util/format_rgb9e5.h index 21feba7b710..21feba7b710 100644 --- a/src/gallium/auxiliary/util/u_format_rgb9e5.h +++ b/src/util/format_rgb9e5.h |