diff options
author | Patrice Mandin <pmandin@caramail.com> | 2007-07-07 00:08:35 +0200 |
---|---|---|
committer | Patrice Mandin <pmandin@caramail.com> | 2007-07-07 00:08:35 +0200 |
commit | f0aa6654e27b279ecb29e9fd19c140cb1ac7946f (patch) | |
tree | ea9caba04ed3c5b3005edd79060002cb66a5e03a /src/mesa/swrast/s_context.h | |
parent | 69501d76fc6a45da48bf4c416ac9e15edd44e7a9 (diff) | |
parent | f98bdfca574478837b33c97d131dad4833e3ee12 (diff) |
Merge branch 'master' of git+ssh://pmandin@git.freedesktop.org/git/mesa/mesa
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, |