mesa: remove unneeded #include of colormac.h

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

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 20216a87d208b07c687935e43f1a60e0d991d228..b163c0aa699c6e592f2172796af6a735e65b3f27 100644 (file)
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -32,7 +32,6 @@
 #include "buffers.h"
 #include "bufferobj.h"
 #include "clear.h"
-#include "colormac.h"
 #include "context.h"
 #include "depth.h"
 #include "enable.h"

diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index b50d79e0c261c91eb849b8c9904717cdcb7c1472..c93e84a04d04761c864eed80875d78e2d1ffd73c 100644 (file)
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -26,11 +26,11 @@
 #include <stdio.h>
 #include "mtypes.h"
 #include "attrib.h"
-#include "colormac.h"
 #include "enums.h"
 #include "formats.h"
 #include "hash.h"
 #include "imports.h"
+#include "macros.h"
 #include "debug.h"
 #include "get.h"
 #include "pixelstore.h"

diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index 7162c6fef0a3eb943442892d94b0b327c19d3e84..ecda2694fc824071957566329681f72124a4905f 100644 (file)
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -30,7 +30,6 @@
 
 #include "glheader.h"
 #include "bufferobj.h"
-#include "colormac.h"
 #include "context.h"
 #include "macros.h"
 #include "pixel.h"

diff --git a/src/mesa/main/pixeltransfer.c b/src/mesa/main/pixeltransfer.c
index 8bbeeb8534b93197db2dab62569f95ac518f3834..94464ea6709343199b3d6bdc10d520b061f7882b 100644 (file)
--- a/src/mesa/main/pixeltransfer.c
+++ b/src/mesa/main/pixeltransfer.c
@@ -31,7 +31,7 @@
 
 
 #include "glheader.h"
-#include "colormac.h"
+#include "macros.h"
 #include "pixeltransfer.h"
 #include "imports.h"
 #include "mtypes.h"

diff --git a/src/mesa/main/samplerobj.h b/src/mesa/main/samplerobj.h
index 988b874d9ee1078c6027218eeca9890bc8e0f524..7bea9111480a1a4a6d97e60958a56d75c10e3052 100644 (file)
--- a/src/mesa/main/samplerobj.h
+++ b/src/mesa/main/samplerobj.h
@@ -32,6 +32,9 @@ extern "C" {
 #endif
 
 
+#include "mtypes.h"
+
+
 struct dd_function_table;
 
 static inline struct gl_sampler_object *

diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index 00234d4ccb38ba45f3b251ffae11a2d3cc78ba1f..0fd1a3683d1ffacf4cbaeb4ac1f4fb872c8f5df9 100644 (file)
--- a/src/mesa/main/texcompress.c
+++ b/src/mesa/main/texcompress.c
@@ -32,7 +32,6 @@
 
 #include "glheader.h"
 #include "imports.h"
-#include "colormac.h"
 #include "context.h"
 #include "formats.h"
 #include "mtypes.h"

diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c
index 562359410b2b81b3922d9c98ed6fbb8b95cf578a..f06f048820d8c8bbeab7cf0619965eb77fc8a6a8 100644 (file)
--- a/src/mesa/main/texcompress_fxt1.c
+++ b/src/mesa/main/texcompress_fxt1.c
@@ -31,7 +31,6 @@
 
 #include "glheader.h"
 #include "imports.h"
-#include "colormac.h"
 #include "image.h"
 #include "macros.h"
 #include "mipmap.h"

diff --git a/src/mesa/main/texcompress_rgtc.c b/src/mesa/main/texcompress_rgtc.c
index f40e4e6c09b337d05bbba786e400e0f9262e493f..66de1f17d8bf894e9b5acaa79a64ebb557311bb0 100644 (file)
--- a/src/mesa/main/texcompress_rgtc.c
+++ b/src/mesa/main/texcompress_rgtc.c
@@ -35,7 +35,6 @@
 
 #include "glheader.h"
 #include "imports.h"
-#include "colormac.h"
 #include "image.h"
 #include "macros.h"
 #include "mipmap.h"

diff --git a/src/mesa/main/texcompress_s3tc.c b/src/mesa/main/texcompress_s3tc.c
index 41d00d4e91dd99c6595100bc41ba62c91d0c76e5..38ce5f89feb4a3d8baf42dc292935a48c1d425aa 100644 (file)
--- a/src/mesa/main/texcompress_s3tc.c
+++ b/src/mesa/main/texcompress_s3tc.c
@@ -35,7 +35,6 @@
 
 #include "glheader.h"
 #include "imports.h"
-#include "colormac.h"
 #include "dlopen.h"
 #include "image.h"
 #include "macros.h"

diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index 1ef7286602972396221a3f6366c5821f3a7786e0..b5d42d3047f8a81f7ff8214801e2eb709909899d 100644 (file)
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -32,7 +32,6 @@
 #include <stdbool.h>
 #include "main/glheader.h"
 #include "main/blend.h"
-#include "main/colormac.h"
 #include "main/context.h"
 #include "main/enums.h"
 #include "main/formats.h"

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 0a7f983fb2904018a75a4e3ada2fa6c241dd2496..1af9d47f030ba27677566de10e4eddf236043fc2 100644 (file)
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -31,8 +31,6 @@
 #include <stdio.h>
 #include "glheader.h"
 #include "bufferobj.h"
-#include "colormac.h"
-#include "colortab.h"
 #include "context.h"
 #include "enums.h"
 #include "macros.h"

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 7ad9d2b68e14828befd021cea0d4fc703bf43c7e..1525205981b7924bbe19aff2c13fa0952be42c3a 100644 (file)
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -53,7 +53,6 @@
 
 #include "glheader.h"
 #include "bufferobj.h"
-#include "colormac.h"
 #include "format_pack.h"
 #include "format_utils.h"
 #include "image.h"

diff --git a/src/mesa/program/prog_execute.c b/src/mesa/program/prog_execute.c
index dc4919ae82807f716498618ba67545402742b7e8..16e8e340d8d93b0221b4ae1e2c8d3e6a028aa530 100644 (file)
--- a/src/mesa/program/prog_execute.c
+++ b/src/mesa/program/prog_execute.c
@@ -37,7 +37,6 @@
 
 #include "c99_math.h"
 #include "main/glheader.h"
-#include "main/colormac.h"
 #include "main/macros.h"
 #include "prog_execute.h"
 #include "prog_instruction.h"