Merge branch '965-glsl'

Conflicts:

	src/mesa/drivers/dri/i965/brw_sf.h
	src/mesa/drivers/dri/i965/intel_context.c

diff --cc src/mesa/drivers/dri/i965/Makefile
Simple merge

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

diff --cc src/mesa/drivers/dri/i965/brw_sf.h
index e894651,23b8968..385f1ee
--- 1/src/mesa/drivers/dri/i965/brw_sf.h
--- 2/src/mesa/drivers/dri/i965/brw_sf.h
+++ b/src/mesa/drivers/dri/i965/brw_sf.h
@@@ -48,16 -49,10 +49,15 @@@ struct brw_sf_prog_key 
     GLuint primitive:2;
     GLuint do_twoside_color:1;
     GLuint do_flat_shading:1;
-    GLuint attrs:16;
     GLuint frontface_ccw:1;
 -   GLuint pad:27;
 +   GLuint do_point_sprite:1;
 +   GLuint pad:10;
 +   GLenum SpriteOrigin;
  };
  
 +struct brw_sf_point_tex {
 +      GLboolean CoordReplace; 
 +};
  
  struct brw_sf_compile {
     struct brw_compile func;

diff --cc src/mesa/drivers/dri/i965/brw_vs.h
Simple merge

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

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

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

diff --cc src/mesa/drivers/dri/i965/brw_wm.h
Simple merge

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

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

diff --cc src/mesa/drivers/dri/i965/intel_context.c
index 7ec316a,a5d8be8..9850997
--- 1/src/mesa/drivers/dri/i965/intel_context.c
--- 2/src/mesa/drivers/dri/i965/intel_context.c
+++ b/src/mesa/drivers/dri/i965/intel_context.c
@@@ -83,7 -81,11 +83,12 @@@ int INTEL_DEBUG = (0)
  #define need_GL_EXT_fog_coord
  #define need_GL_EXT_multi_draw_arrays
  #define need_GL_EXT_secondary_color
 +#define need_GL_EXT_point_parameters
+ #define need_GL_VERSION_2_0
+ #define need_GL_VERSION_2_1
+ #define need_GL_ARB_shader_objects
+ #define need_GL_ARB_vertex_shader
+ 
  #include "extension_helper.h"
  
  #ifndef VERBOSE

diff --cc src/mesa/main/texenvprogram.c
Simple merge

diff --cc src/mesa/shader/program.c
Simple merge

diff --cc src/mesa/shader/slang/slang_codegen.c
Simple merge