diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2010-08-13 20:22:46 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-08-13 20:22:46 -0700 |
| commit | 443a7e4e9a360acbc3e662c098be436f180bf81d (patch) | |
| tree | 71125fc394bdcbc17cd7ed74c592b9a7761541f8 /src/mesa/main/texcompress_s3tc.c | |
| parent | 2f8ee757ab324d599fcb8287789eb5f1a7890d74 (diff) | |
| parent | 27041d7cb3faeaed483538a228573466363ec1c7 (diff) | |
Merge branch 'master' into glsl2
Diffstat (limited to 'src/mesa/main/texcompress_s3tc.c')
| -rw-r--r-- | src/mesa/main/texcompress_s3tc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/texcompress_s3tc.c b/src/mesa/main/texcompress_s3tc.c index 85c394b051..c70792cab6 100644 --- a/src/mesa/main/texcompress_s3tc.c +++ b/src/mesa/main/texcompress_s3tc.c @@ -36,10 +36,10 @@ #include "glheader.h" #include "imports.h" #include "colormac.h" -#include "context.h" #include "convolve.h" #include "dlopen.h" #include "image.h" +#include "macros.h" #include "texcompress.h" #include "texcompress_s3tc.h" #include "texstore.h" |