swrast: remove unneeded #include of colormac.h

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

src/mesa/swrast/s_aatriangle.c

@@ -30,7 +30,6 @@
 
 #include "main/glheader.h"
 #include "main/context.h"
-#include "main/colormac.h"
 #include "main/macros.h"
 #include "main/imports.h"
 #include "main/state.h"

src/mesa/swrast/s_alpha.c

@@ -29,7 +29,6 @@
 
 #include "main/glheader.h"
 #include "main/context.h"
-#include "main/colormac.h"
 #include "main/macros.h"
 
 #include "s_alpha.h"

src/mesa/swrast/s_atifragshader.c

@@ -20,7 +20,6 @@
  */
 
 #include "main/glheader.h"
-#include "main/colormac.h"
 #include "main/macros.h"
 #include "main/atifragshader.h"
 #include "main/samplerobj.h"

src/mesa/swrast/s_context.c

@@ -27,7 +27,6 @@
 
 #include "main/imports.h"
 #include "main/bufferobj.h"
-#include "main/colormac.h"
 #include "main/mtypes.h"
 #include "main/samplerobj.h"
 #include "main/teximage.h"

src/mesa/swrast/s_copypix.c

@@ -25,7 +25,6 @@
 
 #include "main/glheader.h"
 #include "main/context.h"
-#include "main/colormac.h"
 #include "main/condrender.h"
 #include "main/macros.h"
 #include "main/pixeltransfer.h"

src/mesa/swrast/s_feedback.c

@@ -23,7 +23,6 @@
  */
 
 #include "main/glheader.h"
-#include "main/colormac.h"
 #include "main/feedback.h"
 #include "main/macros.h"
 

src/mesa/swrast/s_fog.c

@@ -25,7 +25,6 @@
 
 #include "c99_math.h"
 #include "main/glheader.h"
-#include "main/colormac.h"
 #include "main/macros.h"
 
 #include "s_context.h"

src/mesa/swrast/s_fragprog.c

@@ -23,7 +23,7 @@
  */
 
 #include "main/glheader.h"
-#include "main/colormac.h"
+#include "main/macros.h"
 #include "main/samplerobj.h"
 #include "main/teximage.h"
 #include "program/prog_instruction.h"

src/mesa/swrast/s_lines.c

@@ -25,7 +25,6 @@
 
 #include "main/glheader.h"
 #include "main/context.h"
-#include "main/colormac.h"
 #include "main/macros.h"
 #include "s_aaline.h"
 #include "s_context.h"

src/mesa/swrast/s_points.c

@@ -24,7 +24,6 @@
 
 
 #include "main/glheader.h"
-#include "main/colormac.h"
 #include "main/macros.h"
 #include "s_context.h"
 #include "s_feedback.h"

src/mesa/swrast/s_span.c

@@ -33,7 +33,6 @@
 
 #include "c99_math.h"
 #include "main/glheader.h"
-#include "main/colormac.h"
 #include "main/format_pack.h"
 #include "main/format_unpack.h"
 #include "main/macros.h"

src/mesa/swrast/s_texcombine.c

@@ -26,8 +26,8 @@
 
 #include "main/glheader.h"
 #include "main/context.h"
-#include "main/colormac.h"
 #include "main/imports.h"
+#include "main/macros.h"
 #include "main/pixeltransfer.h"
 #include "main/samplerobj.h"
 #include "program/prog_instruction.h"

src/mesa/swrast/s_texfetch.c

@@ -33,7 +33,6 @@
  */
 
 
-#include "main/colormac.h"
 #include "main/macros.h"
 #include "main/texcompress.h"
 #include "main/texcompress_fxt1.h"

src/mesa/swrast/s_texfilter.c

@@ -26,8 +26,8 @@
 #include "c99_math.h"
 #include "main/glheader.h"
 #include "main/context.h"
-#include "main/colormac.h"
 #include "main/imports.h"
+#include "main/macros.h"
 #include "main/samplerobj.h"
 #include "main/teximage.h"
 #include "main/texobj.h"

src/mesa/swrast/s_texrender.c

@@ -1,6 +1,5 @@
 
 #include "main/context.h"
-#include "main/colormac.h"
 #include "main/fbobject.h"
 #include "main/macros.h"
 #include "main/teximage.h"

src/mesa/swrast/s_triangle.c

@@ -31,7 +31,6 @@
 
 #include "main/glheader.h"
 #include "main/context.h"
-#include "main/colormac.h"
 #include "main/imports.h"
 #include "main/macros.h"
 #include "main/mtypes.h"

src/mesa/swrast/s_zoom.c

@@ -26,7 +26,6 @@
 #include "main/macros.h"
 #include "main/imports.h"
 #include "main/format_pack.h"
-#include "main/colormac.h"
 
 #include "s_context.h"
 #include "s_span.h"

src/mesa/swrast_setup/ss_context.c

@@ -27,7 +27,7 @@
 
 #include "main/glheader.h"
 #include "main/imports.h"
-#include "main/colormac.h"
+#include "main/macros.h"
 #include "tnl/tnl.h"
 #include "tnl/t_context.h"
 #include "tnl/t_pipeline.h"

src/mesa/swrast_setup/ss_triangle.c

@@ -27,7 +27,6 @@
 
 #include "c99_math.h"
 #include "main/glheader.h"
-#include "main/colormac.h"
 #include "main/macros.h"
 #include "main/mtypes.h"