util: Move format_r11g11b10f.h to src/util

It's used from both mesa main and gallium.

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

src/gallium/auxiliary/Makefile.sources

@@ -228,7 +228,6 @@ C_SOURCES := \
 	util/u_format_latc.h \
 	util/u_format_other.c \
 	util/u_format_other.h \
-	util/u_format_r11g11b10f.h \
 	util/u_format_rgtc.c \
 	util/u_format_rgtc.h \
 	util/u_format_s3tc.c \

src/gallium/auxiliary/util/u_format_other.c

@@ -29,7 +29,7 @@
 #include "u_math.h"
 #include "u_format_other.h"
 #include "util/format_rgb9e5.h"
-#include "u_format_r11g11b10f.h"
+#include "util/format_r11g11b10f.h"
 
 
 void

src/mesa/main/format_pack.py

@@ -47,7 +47,7 @@ string = """/*
 #include "format_utils.h"
 #include "macros.h"
 #include "util/format_rgb9e5.h"
-#include "../../gallium/auxiliary/util/u_format_r11g11b10f.h"
+#include "util/format_r11g11b10f.h"
 #include "util/format_srgb.h"
 
 #define UNPACK(SRC, OFFSET, BITS) (((SRC) >> (OFFSET)) & MAX_UINT(BITS))

src/mesa/main/format_unpack.py

@@ -47,7 +47,7 @@ string = """/*
 #include "format_utils.h"
 #include "macros.h"
 #include "util/format_rgb9e5.h"
-#include "../../gallium/auxiliary/util/u_format_r11g11b10f.h"
+#include "util/format_r11g11b10f.h"
 #include "util/format_srgb.h"
 
 #define UNPACK(SRC, OFFSET, BITS) (((SRC) >> (OFFSET)) & MAX_UINT(BITS))

src/mesa/main/mipmap.c

@@ -39,7 +39,7 @@
 #include "macros.h"
 #include "util/half_float.h"
 #include "util/format_rgb9e5.h"
-#include "../../gallium/auxiliary/util/u_format_r11g11b10f.h"
+#include "util/format_r11g11b10f.h"
 
 
 

src/mesa/main/texstore.c

@@ -74,7 +74,7 @@
 #include "glformats.h"
 #include "pixeltransfer.h"
 #include "util/format_rgb9e5.h"
-#include "../../gallium/auxiliary/util/u_format_r11g11b10f.h"
+#include "util/format_r11g11b10f.h"
 
 
 enum {

src/mesa/swrast/s_texfetch.c

@@ -44,7 +44,7 @@
 #include "s_context.h"
 #include "s_texfetch.h"
 #include "util/format_rgb9e5.h"
-#include "../../gallium/auxiliary/util/u_format_r11g11b10f.h"
+#include "util/format_r11g11b10f.h"
 #include "util/format_srgb.h"
 
 

src/mesa/vbo/vbo_attrib_tmp.h

@@ -25,7 +25,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
 
-#include "util/u_format_r11g11b10f.h"
+#include "util/format_r11g11b10f.h"
 #include "main/varray.h"
 
 

src/util/Makefile.sources

@@ -4,6 +4,7 @@ MESA_UTIL_FILES :=	\
 	bitset.h \
 	debug.c \
 	debug.h \
+	format_r11g11b10f.h \
 	format_rgb9e5.h \
 	format_srgb.h \
 	half_float.c \