summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2016-08-03 09:22:13 -0700
committerJason Ekstrand <jason.ekstrand@intel.com>2016-08-05 09:06:57 -0700
commitf29fd7897adc920ef816840a3f4fc25dcd65228b (patch)
treeb2f289d2e39034200875b1cf12fad05f0b80fd17
parent6c665cdfc5d9eca2136f87e10eb80a6c59d5156f (diff)
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>
-rw-r--r--src/gallium/auxiliary/Makefile.sources1
-rw-r--r--src/gallium/auxiliary/util/u_format_other.c2
-rw-r--r--src/mesa/main/format_pack.py2
-rw-r--r--src/mesa/main/format_unpack.py2
-rw-r--r--src/mesa/main/mipmap.c2
-rw-r--r--src/mesa/main/texstore.c2
-rw-r--r--src/mesa/swrast/s_texfetch.c2
-rw-r--r--src/mesa/vbo/vbo_attrib_tmp.h2
-rw-r--r--src/util/Makefile.sources1
-rw-r--r--src/util/format_r11g11b10f.h (renamed from src/gallium/auxiliary/util/u_format_r11g11b10f.h)0
10 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
index 230f52beec..586f05781d 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/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 \
diff --git a/src/gallium/auxiliary/util/u_format_other.c b/src/gallium/auxiliary/util/u_format_other.c
index 81978355f9..c53bf550a6 100644
--- a/src/gallium/auxiliary/util/u_format_other.c
+++ b/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
diff --git a/src/mesa/main/format_pack.py b/src/mesa/main/format_pack.py
index 4d45b09d10..6f2b37368d 100644
--- a/src/mesa/main/format_pack.py
+++ b/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))
diff --git a/src/mesa/main/format_unpack.py b/src/mesa/main/format_unpack.py
index fc7ea3b4ab..b7fc4c3fc8 100644
--- a/src/mesa/main/format_unpack.py
+++ b/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))
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index d8fa30544f..05c13fbba0 100644
--- a/src/mesa/main/mipmap.c
+++ b/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"
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 3c391acaa1..615ba63362 100644
--- a/src/mesa/main/texstore.c
+++ b/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 {
diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c
index 6856129588..4353ea0e47 100644
--- a/src/mesa/swrast/s_texfetch.c
+++ b/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"
diff --git a/src/mesa/vbo/vbo_attrib_tmp.h b/src/mesa/vbo/vbo_attrib_tmp.h
index ed0b2deda4..4e2c874ef3 100644
--- a/src/mesa/vbo/vbo_attrib_tmp.h
+++ b/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"
diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources
index 6bf01437a8..6def4f7c56 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_r11g11b10f.h \
format_rgb9e5.h \
format_srgb.h \
half_float.c \
diff --git a/src/gallium/auxiliary/util/u_format_r11g11b10f.h b/src/util/format_r11g11b10f.h
index 218822b16e..218822b16e 100644
--- a/src/gallium/auxiliary/util/u_format_r11g11b10f.h
+++ b/src/util/format_r11g11b10f.h