Module: Mesa Branch: master Commit: f29fd7897adc920ef816840a3f4fc25dcd65228b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f29fd7897adc920ef816840a3f4fc25dcd65228b
Author: Jason Ekstrand <[email protected]> Date: Wed Aug 3 09:22:13 2016 -0700 util: Move format_r11g11b10f.h to src/util It's used from both mesa main and gallium. Signed-off-by: Jason Ekstrand <[email protected]> Reviewed-by: Roland Scheidegger <[email protected]> --- src/gallium/auxiliary/Makefile.sources | 1 - 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/mesa/vbo/vbo_attrib_tmp.h | 2 +- src/util/Makefile.sources | 1 + .../auxiliary/util/u_format_r11g11b10f.h => util/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 230f52b..586f057 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 8197835..c53bf55 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 4d45b09..6f2b373 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 fc7ea3b..b7fc4c3 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 d8fa305..05c13fb 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 3c391ac..615ba63 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 6856129..4353ea0 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 ed0b2de..4e2c874 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 6bf0143..6def4f7 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 similarity index 100% rename from src/gallium/auxiliary/util/u_format_r11g11b10f.h rename to src/util/format_r11g11b10f.h _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
