diff options
| author | Brian Paul <[email protected]> | 2008-09-18 12:26:54 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2008-09-18 12:26:54 -0600 |
| commit | bbd287103dad776d8a45c87c4e51fbc26d9b80d5 (patch) | |
| tree | 31aa18ea837bbb6c6ea0bb7e0cc1724f98d32509 /src/mesa/swrast_setup | |
| parent | 5e530d8384b0d9bb867d6407315587c84a443902 (diff) | |
mesa: prefix a bunch of #include lines with "main/".
This is another step toward removing a whole bunch of -I flags from
the cc commands. Still need to address driver code...
Diffstat (limited to 'src/mesa/swrast_setup')
| -rw-r--r-- | src/mesa/swrast_setup/ss_context.c | 13 | ||||
| -rw-r--r-- | src/mesa/swrast_setup/ss_context.h | 2 | ||||
| -rw-r--r-- | src/mesa/swrast_setup/ss_triangle.c | 8 | ||||
| -rw-r--r-- | src/mesa/swrast_setup/ss_triangle.h | 1 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/mesa/swrast_setup/ss_context.c b/src/mesa/swrast_setup/ss_context.c index a4f949ddfe8..f4d90c514bb 100644 --- a/src/mesa/swrast_setup/ss_context.c +++ b/src/mesa/swrast_setup/ss_context.c @@ -25,16 +25,17 @@ * Keith Whitwell <[email protected]> */ -#include "glheader.h" -#include "imports.h" -#include "colormac.h" -#include "ss_context.h" -#include "ss_triangle.h" -#include "swrast_setup.h" +#include "main/glheader.h" +#include "main/imports.h" +#include "main/colormac.h" #include "tnl/tnl.h" #include "tnl/t_context.h" #include "tnl/t_pipeline.h" #include "tnl/t_vertex.h" +#include "swrast_setup.h" +#include "ss_context.h" +#include "ss_triangle.h" + /* Need to check lighting state and vertex program state to know * if two-sided lighting is in effect. diff --git a/src/mesa/swrast_setup/ss_context.h b/src/mesa/swrast_setup/ss_context.h index 11f9ded3ffb..1ec293fade1 100644 --- a/src/mesa/swrast_setup/ss_context.h +++ b/src/mesa/swrast_setup/ss_context.h @@ -28,7 +28,7 @@ #ifndef SS_CONTEXT_H #define SS_CONTEXT_H -#include "mtypes.h" +#include "main/mtypes.h" #include "swrast/swrast.h" #include "swrast_setup.h" #include "tnl/t_context.h" diff --git a/src/mesa/swrast_setup/ss_triangle.c b/src/mesa/swrast_setup/ss_triangle.c index 5a0f1f2429c..54e24c4c44e 100644 --- a/src/mesa/swrast_setup/ss_triangle.c +++ b/src/mesa/swrast_setup/ss_triangle.c @@ -25,10 +25,10 @@ * Keith Whitwell <[email protected]> */ -#include "glheader.h" -#include "colormac.h" -#include "macros.h" -#include "mtypes.h" +#include "main/glheader.h" +#include "main/colormac.h" +#include "main/macros.h" +#include "main/mtypes.h" #include "tnl/t_context.h" diff --git a/src/mesa/swrast_setup/ss_triangle.h b/src/mesa/swrast_setup/ss_triangle.h index 78833269e6e..007fa2e9141 100644 --- a/src/mesa/swrast_setup/ss_triangle.h +++ b/src/mesa/swrast_setup/ss_triangle.h @@ -29,7 +29,6 @@ #ifndef SS_TRIANGLE_H #define SS_TRIANGLE_H -#include "mtypes.h" #include "ss_context.h" |