diff options
author | Keith Whitwell <keithw@vmware.com> | 2009-12-01 10:57:37 +0000 |
---|---|---|
committer | Keith Whitwell <keithw@vmware.com> | 2009-12-01 10:57:37 +0000 |
commit | 06d3732a9094030fc33120f16f162e0d405f132c (patch) | |
tree | 185159951093f49f1877e78eaf01f6d1ea01e560 /src/mesa/main/texenv.c | |
parent | 853d4807fe220b17cf5af5a76b24f2466238013b (diff) | |
parent | f17dbe256bb38c35d885260be7e5856f1561de97 (diff) |
Merge commit 'origin/mesa_7_7_branch'
Conflicts:
src/gallium/drivers/svga/svga_screen_texture.c
src/gallium/state_trackers/xorg/xorg_composite.c
src/gallium/state_trackers/xorg/xorg_exa.c
src/gallium/state_trackers/xorg/xorg_renderer.c
src/gallium/state_trackers/xorg/xorg_xv.c
src/mesa/main/texgetimage.c
src/mesa/main/version.h
Diffstat (limited to 'src/mesa/main/texenv.c')
-rw-r--r-- | src/mesa/main/texenv.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/main/texenv.c b/src/mesa/main/texenv.c index 6d86a4275c..4442fb8cf8 100644 --- a/src/mesa/main/texenv.c +++ b/src/mesa/main/texenv.c @@ -598,7 +598,10 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param ) void GLAPIENTRY _mesa_TexEnvf( GLenum target, GLenum pname, GLfloat param ) { - _mesa_TexEnvfv( target, pname, ¶m ); + GLfloat p[4]; + p[0] = param; + p[1] = p[2] = p[3] = 0.0; + _mesa_TexEnvfv( target, pname, p ); } |