diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-10-15 13:21:11 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-10-15 13:21:11 +1100 |
| commit | 295d6f8e8f03192320aa8d4ed767427dd06071a5 (patch) | |
| tree | ca8d7949d700d96b7d123366aa57b80894d1757f /src/mesa/swrast/s_texcombine.c | |
| parent | 2882a2db7a766c60bb231978ea829632438dd8a4 (diff) | |
| parent | 41ccdde767e7aba6e8e6a9a035eacd6338c03a95 (diff) | |
Merge remote branch 'origin/gallium-0.2' into gallium-0.2
Diffstat (limited to 'src/mesa/swrast/s_texcombine.c')
| -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" |