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/main/state.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/main/state.c')
| -rw-r--r-- | src/mesa/main/state.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index 0a83abc7dd..66f8ac6408 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -35,10 +35,10 @@ #include "accum.h" #include "api_loopback.h" #if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program -#include "arbprogram.h" +#include "shader/arbprogram.h" #endif #if FEATURE_ATI_fragment_shader -#include "atifragshader.h" +#include "shader/atifragshader.h" #endif #include "attrib.h" #include "blend.h" @@ -85,18 +85,18 @@ #include "mtypes.h" #include "varray.h" #if FEATURE_NV_vertex_program -#include "nvprogram.h" +#include "shader/nvprogram.h" #endif #if FEATURE_NV_fragment_program -#include "nvprogram.h" -#include "program.h" +#include "shader/nvprogram.h" +#include "shader/program.h" #include "texenvprogram.h" #endif #if FEATURE_ARB_shader_objects #include "shaders.h" #endif #include "debug.h" -#include "dispatch.h" +#include "glapi/dispatch.h" |