summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-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
6 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/main/format_pack.py b/src/mesa/main/format_pack.py
index 4d45b09d105..6f2b37368d4 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 fc7ea3b4ab7..b7fc4c3fc8d 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 d8fa30544fe..05c13fbba0c 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 3c391acaa1d..615ba63362e 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 6856129588e..4353ea0e471 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 ed0b2deda42..4e2c874ef3d 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"