Mesa (master): util: Move format_rgb9e5.h to src/util

[Jason Ekstrand]

Module: Mesa
Branch: master
Commit: 6c665cdfc5d9eca2136f87e10eb80a6c59d5156f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6c665cdfc5d9eca2136f87e10eb80a6c59d5156f

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Wed Aug  3 09:16:12 2016 -0700

util: Move format_rgb9e5.h to src/util

It's used from both mesa main and gallium.

Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
Reviewed-by: Roland Scheidegger <sroland at vmware.com>

---

 src/gallium/auxiliary/Makefile.sources                                 | 1 -
 src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c                      | 2 +-
 src/gallium/auxiliary/util/u_format_other.c                            | 2 +-
 src/mesa/main/format_pack.py                                           | 2 +-
 src/mesa/main/format_unpack.py                                         | 2 +-
 src/mesa/main/mipmap.c                                                 | 2 +-
 src/mesa/main/texstore.c                                               | 2 +-
 src/mesa/swrast/s_texfetch.c                                           | 2 +-
 src/util/Makefile.sources                                              | 1 +
 src/{gallium/auxiliary/util/u_format_rgb9e5.h => util/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 26f7eee..230f52b 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 3a8327d..1b48fc2 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 20752d4..8197835 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 2f43a30..4d45b09 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 0ae73b8..fc7ea3b 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 996e3f8..d8fa305 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 b54e033..3c391ac 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 721d088..6856129 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 aec41c3..6bf0143 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
similarity index 100%
rename from src/gallium/auxiliary/util/u_format_rgb9e5.h
rename to src/util/format_rgb9e5.h