From: Brian Paul <brianp@vmware.com>
Date: Fri, 11 Dec 2009 16:22:00 +0000 (-0700)
Subject: Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b605f4ff11c894500f2d0273c5d4653ff413448d;p=mesa.git

Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
---

b605f4ff11c894500f2d0273c5d4653ff413448d
diff --cc src/mesa/main/texgen.c
index 5abb1ff0ab6,f9d38215d60..be4e03bc56c
--- a/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 );
  }