Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

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

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

diff --cc src/mesa/main/texgen.c
index 5abb1ff0ab60a772448230e657b4b9d5c43317ff,f9d38215d6031fac15f21bb576e569f0724a6aa0..be4e03bc56c328d98d3027b24d0cd277ffecfcf7
--- 1/src/mesa/main/texgen.c
--- 2/src/mesa/main/texgen.c
+++ b/src/mesa/main/texgen.c
@@@ -183,11 -178,13 +183,13 @@@ _mesa_TexGeniv(GLenum coord, GLenum pna
  }
  
  
 -void GLAPIENTRY
 +static void GLAPIENTRY
  _mesa_TexGend(GLenum coord, GLenum pname, GLdouble param )
  {
-    GLfloat p = (GLfloat) param;
-    _mesa_TexGenfv( coord, pname, &p );
+    GLfloat p[4];
+    p[0] = (GLfloat) param;
+    p[1] = p[2] = p[3] = 0.0F;
+    _mesa_TexGenfv( coord, pname, p );
  }
  
  

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

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

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