From 2768a0b1b42f3c1531ab9c3647a93f0504002280 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 1 Apr 2015 09:45:57 -0600 Subject: [PATCH] mesa: remove unneeded #include of colormac.h Acked-by: Matt Turner Reviewed-by: Mark Janes --- src/mesa/main/attrib.c | 1 - src/mesa/main/debug.c | 2 +- src/mesa/main/pixel.c | 1 - src/mesa/main/pixeltransfer.c | 2 +- src/mesa/main/samplerobj.h | 3 +++ src/mesa/main/texcompress.c | 1 - src/mesa/main/texcompress_fxt1.c | 1 - src/mesa/main/texcompress_rgtc.c | 1 - src/mesa/main/texcompress_s3tc.c | 1 - src/mesa/main/texparam.c | 1 - src/mesa/main/texstate.c | 2 -- src/mesa/main/texstore.c | 1 - src/mesa/program/prog_execute.c | 1 - 13 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index 20216a87d20..b163c0aa699 100644 --- 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 b50d79e0c26..c93e84a04d0 100644 --- a/src/mesa/main/debug.c +++ b/src/mesa/main/debug.c @@ -26,11 +26,11 @@ #include #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 7162c6fef0a..ecda2694fc8 100644 --- 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 8bbeeb8534b..94464ea6709 100644 --- 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 988b874d9ee..7bea9111480 100644 --- 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 00234d4ccb3..0fd1a3683d1 100644 --- 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 562359410b2..f06f048820d 100644 --- 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 f40e4e6c09b..66de1f17d8b 100644 --- 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 41d00d4e91d..38ce5f89feb 100644 --- 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 1ef72866029..b5d42d3047f 100644 --- a/src/mesa/main/texparam.c +++ b/src/mesa/main/texparam.c @@ -32,7 +32,6 @@ #include #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 0a7f983fb29..1af9d47f030 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -31,8 +31,6 @@ #include #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 7ad9d2b68e1..1525205981b 100644 --- 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 dc4919ae828..16e8e340d8d 100644 --- 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" -- 2.30.2