diff options
| author | michal <michal@michal-laptop.(none)> | 2007-07-06 17:53:44 +0200 |
|---|---|---|
| committer | michal <michal@michal-laptop.(none)> | 2007-07-06 17:53:44 +0200 |
| commit | 3b8bc1f46758d4da9155419fcf558a493e729501 (patch) | |
| tree | 0dbfb4ae1ed6b49caaed3e662b27db30fe2e8801 /src/mesa/main/state.c | |
| parent | ffe58739da9eee2e99682747cc8f26e412c87430 (diff) | |
| parent | ffa2659204121f703208782ff225a22e0c21b173 (diff) | |
Merge branch 'master' of git+ssh://michal@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch
Diffstat (limited to 'src/mesa/main/state.c')
| -rw-r--r-- | src/mesa/main/state.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index 96ee5127e1..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" @@ -812,6 +812,11 @@ _mesa_init_exec_table(struct _glapi_table *exec) SET_ProgramEnvParameters4fvEXT(exec, _mesa_ProgramEnvParameters4fvEXT); SET_ProgramLocalParameters4fvEXT(exec, _mesa_ProgramLocalParameters4fvEXT); #endif + + /* GL_MESA_texture_array / GL_EXT_texture_array */ +#if FEATURE_EXT_framebuffer_object + SET_FramebufferTextureLayerEXT(exec, _mesa_FramebufferTextureLayerEXT); +#endif } |