tree b7462a02c678d3d755896c22a0f7f8387cb148c0
parent f2122d47248e59a0f23c15d7f647d7e2072c8d79
parent ec2b92f98c2e7f161521b447cc1d9a36bce3707c
author Brian Paul <brianp@vmware.com> 1277353826 -0600
committer Brian Paul <brianp@vmware.com> 1277353826 -0600

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