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

diff --cc src/mesa/drivers/common/meta.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_context.c
index d13b9ae,e688431..6d064b8
--- 1/src/mesa/drivers/dri/i965/brw_context.c
--- 2/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@@ -34,7 -34,8 +34,6 @@@
  #include "main/api_noop.h"
  #include "main/macros.h"
  #include "main/simple_list.h"
 -#include "program/shader_api.h"
--
  #include "brw_context.h"
  #include "brw_defines.h"
  #include "brw_draw.h"

diff --cc src/mesa/drivers/dri/i965/brw_curbe.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_program.c
index bd560ac,cc9ac6d..aeed24d
--- 1/src/mesa/drivers/dri/i965/brw_program.c
--- 2/src/mesa/drivers/dri/i965/brw_program.c
+++ b/src/mesa/drivers/dri/i965/brw_program.c
@@@ -31,10 -31,10 +31,10 @@@
    
  #include "main/imports.h"
  #include "main/enums.h"
- #include "shader/prog_parameter.h"
- #include "shader/program.h"
- #include "shader/programopt.h"
- #include "shader/shader_api.h"
++#include "main/shaderobj.h"
+ #include "program/prog_parameter.h"
+ #include "program/program.h"
+ #include "program/programopt.h"
 -#include "program/shader_api.h"
  #include "tnl/tnl.h"
  
  #include "brw_context.h"

diff --cc src/mesa/drivers/dri/i965/brw_vs_surface_state.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_wm_surface_state.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/gen6_wm_state.c
Simple merge

diff --cc src/mesa/drivers/dri/r600/r700_assembler.c
Simple merge

diff --cc src/mesa/drivers/dri/r600/r700_fragprog.c
Simple merge

diff --cc src/mesa/main/arbprogram.h
index df16513,df16513..787ffd6
--- 1/src/mesa/shader/arbprogram.h
--- 2/src/mesa/main/arbprogram.h
+++ b/src/mesa/main/arbprogram.h
@@@ -27,6 -27,6 +27,10 @@@
  #define ARBPROGRAM_H
  
  
++#include "compiler.h"
++#include "glheader.h"
++
++
  extern void GLAPIENTRY
  _mesa_BindProgram(GLenum target, GLuint id);