From 3fdd9fa556e9ba48244cb2b3966d3bfb0b84731b Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Fri, 30 Jul 2010 00:41:08 -0700 Subject: mesa: Include macros.h in files that use symbols from macros.h. Don't rely on inclusion of other files that already include macros.h. --- src/mesa/math/m_translate.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/mesa/math/m_translate.c') diff --git a/src/mesa/math/m_translate.c b/src/mesa/math/m_translate.c index b12b07957c..1d26fa147d 100644 --- a/src/mesa/math/m_translate.c +++ b/src/mesa/math/m_translate.c @@ -29,6 +29,7 @@ #include "main/glheader.h" +#include "main/macros.h" #include "main/mtypes.h" /* GLchan hack */ #include "main/colormac.h" -- cgit v1.2.3 From 1a537b639ee7f2d35230c68ba89491711919656d Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Fri, 30 Jul 2010 12:13:17 -0700 Subject: mesa: Remove unnecessary headers. --- src/mesa/main/texstore.c | 1 - src/mesa/math/m_translate.c | 1 - src/mesa/state_tracker/st_cb_drawtex.c | 1 - src/mesa/swrast/s_context.c | 1 - src/mesa/swrast/s_readpix.c | 1 - src/mesa/vbo/vbo_exec_draw.c | 1 - 6 files changed, 6 deletions(-) (limited to 'src/mesa/math/m_translate.c') diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index 0f21395af3..2989fdb72e 100644 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -55,7 +55,6 @@ #include "glheader.h" #include "bufferobj.h" #include "colormac.h" -#include "context.h" #include "convolve.h" #include "image.h" #include "macros.h" diff --git a/src/mesa/math/m_translate.c b/src/mesa/math/m_translate.c index 1d26fa147d..51daf7bfd3 100644 --- a/src/mesa/math/m_translate.c +++ b/src/mesa/math/m_translate.c @@ -31,7 +31,6 @@ #include "main/glheader.h" #include "main/macros.h" #include "main/mtypes.h" /* GLchan hack */ -#include "main/colormac.h" #include "m_translate.h" diff --git a/src/mesa/state_tracker/st_cb_drawtex.c b/src/mesa/state_tracker/st_cb_drawtex.c index b191a7f890..c99a8d792e 100644 --- a/src/mesa/state_tracker/st_cb_drawtex.c +++ b/src/mesa/state_tracker/st_cb_drawtex.c @@ -14,7 +14,6 @@ #include "main/imports.h" #include "main/image.h" -#include "main/bufferobj.h" #include "main/macros.h" #include "program/program.h" #include "program/prog_print.h" diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c index 6d2d17c61d..d8d8a80b7d 100644 --- a/src/mesa/swrast/s_context.c +++ b/src/mesa/swrast/s_context.c @@ -28,7 +28,6 @@ #include "main/imports.h" #include "main/bufferobj.h" -#include "main/context.h" #include "main/colormac.h" #include "main/mtypes.h" #include "main/teximage.h" diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c index 6ad9aceec7..553fd9a76d 100644 --- a/src/mesa/swrast/s_readpix.c +++ b/src/mesa/swrast/s_readpix.c @@ -27,7 +27,6 @@ #include "main/bufferobj.h" #include "main/colormac.h" #include "main/convolve.h" -#include "main/context.h" #include "main/feedback.h" #include "main/formats.h" #include "main/image.h" diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c index 045af46da8..be2b646ee3 100644 --- a/src/mesa/vbo/vbo_exec_draw.c +++ b/src/mesa/vbo/vbo_exec_draw.c @@ -27,7 +27,6 @@ #include "main/glheader.h" #include "main/bufferobj.h" -#include "main/context.h" #include "main/enums.h" #include "main/state.h" -- cgit v1.2.3