diff options
| author | Brian Paul <brianp@vmware.com> | 2010-06-23 22:30:26 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-06-23 22:30:26 -0600 |
| commit | ca12aefdacd22fb42e3f1d3852db4c12de886554 (patch) | |
| tree | b7462a02c678d3d755896c22a0f7f8387cb148c0 /src/mesa/swrast/s_context.h | |
| parent | f2122d47248e59a0f23c15d7f647d7e2072c8d79 (diff) | |
| parent | ec2b92f98c2e7f161521b447cc1d9a36bce3707c (diff) | |
Merge branch 'shader-file-reorg'
1. Move all GL entrypoint functions and files into src/mesa/main/
This includes the ARB vp/vp, NV vp/fp, ATI fragshader and GLSL bits
that were in src/mesa/shader/
2. Move src/mesa/shader/slang/ to src/mesa/slang/ to reduce the tree depth
3. Rename src/mesa/shader/ to src/mesa/program/ since all the
remaining files are concerned with GPU programs.
4. Misc code refactoring. In particular, I got rid of most of the
GLSL-related ctx->Driver hook functions. None of the drivers used
them.
Conflicts:
src/mesa/drivers/dri/i965/brw_context.c
Diffstat (limited to 'src/mesa/swrast/s_context.h')
| -rw-r--r-- | src/mesa/swrast/s_context.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_context.h b/src/mesa/swrast/s_context.h index 9059f9b5ec..c9755e6da1 100644 --- a/src/mesa/swrast/s_context.h +++ b/src/mesa/swrast/s_context.h @@ -44,7 +44,7 @@ #define S_CONTEXT_H #include "main/mtypes.h" -#include "shader/prog_execute.h" +#include "program/prog_execute.h" #include "swrast.h" #include "s_span.h" |