From 6c665cdfc5d9eca2136f87e10eb80a6c59d5156f Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 3 Aug 2016 09:16:12 -0700 Subject: util: Move format_rgb9e5.h to src/util It's used from both mesa main and gallium. Signed-off-by: Jason Ekstrand Reviewed-by: Roland Scheidegger --- 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 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/mesa') 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" -- cgit v1.1