diff options
author | Zou Nan hai <nanhai.zou@intel.com> | 2007-07-17 15:42:39 +0800 |
---|---|---|
committer | Zou Nan hai <nanhai.zou@intel.com> | 2007-07-17 15:42:39 +0800 |
commit | 3c00cdc5f37856f303a6256677364ae89200c509 (patch) | |
tree | b4f191fb2bbe9b409fdc775db8f537c439974a21 /src/mesa/swrast/s_context.h | |
parent | 24e7acd5e4f1e7e71909f94fd1f075abd268d086 (diff) | |
parent | 7b410f366fa117a03a7e838562215d2dca3f8cbc (diff) |
Merge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa into 965-glsl
Diffstat (limited to 'src/mesa/swrast/s_context.h')
-rw-r--r-- | src/mesa/swrast/s_context.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_context.h b/src/mesa/swrast/s_context.h index f118eb92ca..daa07e1578 100644 --- a/src/mesa/swrast/s_context.h +++ b/src/mesa/swrast/s_context.h @@ -43,10 +43,10 @@ #ifndef S_CONTEXT_H #define S_CONTEXT_H -#include "mtypes.h" +#include "main/mtypes.h" +#include "shader/prog_execute.h" #include "swrast.h" #include "s_span.h" -#include "prog_execute.h" typedef void (*texture_sample_func)(GLcontext *ctx, |