diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-10-10 16:40:16 -0600 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-10-10 16:40:16 -0600 |
| commit | 2a6c6fe01e84ffd54b47ea11aa766960df6ddcaf (patch) | |
| tree | d0cab73abfa138f30cb74371bbb16060893b6c07 /src/mesa/swrast | |
| parent | 01e312a73b68dc5ddffca0d1b1472fc5dcb6f59e (diff) | |
| parent | 24748268a3ac7bedc2c9ae5bf76c4c741d539f80 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Diffstat (limited to 'src/mesa/swrast')
| -rw-r--r-- | src/mesa/swrast/s_texcombine.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c index 4e3d329075..632d650007 100644 --- a/src/mesa/swrast/s_texcombine.c +++ b/src/mesa/swrast/s_texcombine.c @@ -26,6 +26,7 @@ #include "main/glheader.h" #include "main/context.h" #include "main/colormac.h" +#include "main/image.h" #include "main/imports.h" #include "main/macros.h" #include "main/pixel.h" |