diff options
| author | Brian Paul <[email protected]> | 2015-04-01 09:45:31 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2015-04-01 12:04:28 -0600 |
| commit | 8ac9407a835ee892d96f326b0c56967046cbb982 (patch) | |
| tree | 87b8797ad6e53e62120775182a45fe715a36ef10 /src/mesa/swrast/s_texcombine.c | |
| parent | 2ad8af1a0c319c83e4a8e00db3a9b9cb0ae029eb (diff) | |
swrast: remove unneeded #include of colormac.h
Acked-by: Matt Turner <[email protected]>
Reviewed-by: Mark Janes <[email protected]>
Diffstat (limited to 'src/mesa/swrast/s_texcombine.c')
| -rw-r--r-- | src/mesa/swrast/s_texcombine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c index 58ff1646583..0adb8e5ba0d 100644 --- a/src/mesa/swrast/s_texcombine.c +++ b/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" |