mesa: don't include colormac.h in format code

Acked-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Mark Janes <mark.a.janes@intel.com>

diff --git a/src/mesa/main/format_pack.py b/src/mesa/main/format_pack.py
index f141da83ca4148e67685631a47a126afb5b24374..2f43a30ddd8071cd2d1d4da3eccdb55bf0537c63 100644 (file)
--- a/src/mesa/main/format_pack.py
+++ b/src/mesa/main/format_pack.py
@@ -43,7 +43,6 @@ string = """/*
 
 #include <stdint.h>
 
-#include "colormac.h"
 #include "format_pack.h"
 #include "format_utils.h"
 #include "macros.h"

diff --git a/src/mesa/main/format_unpack.h b/src/mesa/main/format_unpack.h
index eba3c665070e8b87ae9625c43d212679b63f5046..964c6077af271dc63fa49a7e8432fbdac7481bfd 100644 (file)
--- a/src/mesa/main/format_unpack.h
+++ b/src/mesa/main/format_unpack.h
@@ -25,6 +25,8 @@
 #ifndef FORMAT_UNPACK_H
 #define FORMAT_UNPACK_H
 
+#include "formats.h"
+
 extern void
 _mesa_unpack_rgba_row(mesa_format format, GLuint n,
                       const void *src, GLfloat dst[][4]);

diff --git a/src/mesa/main/format_unpack.py b/src/mesa/main/format_unpack.py
index 53bdf641d124dd48328e497aa49d07d9b71de99d..5928c2018eb1a87a669a321c1a3c567341ca8fc0 100644 (file)
--- a/src/mesa/main/format_unpack.py
+++ b/src/mesa/main/format_unpack.py
@@ -43,7 +43,6 @@ string = """/*
 
 #include <stdint.h>
 
-#include "colormac.h"
 #include "format_unpack.h"
 #include "format_utils.h"
 #include "macros.h"