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/shader/arbprogparse.c | |
| parent | 69501d76fc6a45da48bf4c416ac9e15edd44e7a9 (diff) | |
| parent | f98bdfca574478837b33c97d131dad4833e3ee12 (diff) | |
Merge branch 'master' of git+ssh://pmandin@git.freedesktop.org/git/mesa/mesa
Diffstat (limited to 'src/mesa/shader/arbprogparse.c')
| -rw-r--r-- | src/mesa/shader/arbprogparse.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c index 5d8f763741..9a5290d920 100644 --- a/src/mesa/shader/arbprogparse.c +++ b/src/mesa/shader/arbprogparse.c @@ -30,10 +30,10 @@ * \author Karl Rasche */ -#include "glheader.h" -#include "imports.h" +#include "main/glheader.h" +#include "main/imports.h" +#include "shader/grammar/grammar_mesa.h" #include "arbprogparse.h" -#include "grammar_mesa.h" #include "program.h" #include "prog_parameter.h" #include "prog_statevars.h" @@ -3573,7 +3573,7 @@ parse_instructions(GLcontext * ctx, const GLubyte * inst, /* XXX temporary */ LONGSTRING static char core_grammar_text[] = -#include "grammar_syn.h" +#include "shader/grammar/grammar_syn.h" ; |