Merge branch 'shader-file-reorg'
authorBrian Paul <brianp@vmware.com>
Thu, 24 Jun 2010 04:30:26 +0000 (22:30 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 24 Jun 2010 04:30:26 +0000 (22:30 -0600)
commitca12aefdacd22fb42e3f1d3852db4c12de886554
treeb7462a02c678d3d755896c22a0f7f8387cb148c0
parentf2122d47248e59a0f23c15d7f647d7e2072c8d79
parentec2b92f98c2e7f161521b447cc1d9a36bce3707c
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
src/mesa/drivers/common/meta.c
src/mesa/drivers/dri/i965/brw_context.c
src/mesa/drivers/dri/i965/brw_curbe.c
src/mesa/drivers/dri/i965/brw_program.c
src/mesa/drivers/dri/i965/brw_vs_surface_state.c
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
src/mesa/drivers/dri/i965/gen6_wm_state.c
src/mesa/drivers/dri/r600/r700_assembler.c
src/mesa/drivers/dri/r600/r700_fragprog.c
src/mesa/main/arbprogram.h