diff options
| author | Eric Anholt <eric@anholt.net> | 2010-07-26 17:47:59 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-07-26 17:53:27 -0700 |
| commit | afe125e0a18ac3886c45c7e6b02b122fb2d327b5 (patch) | |
| tree | 78621707e71154c0b388b0baacffc26432b7e992 /src/mesa/vbo | |
| parent | d64343f1ae84979bd154475badf11af8a9bfc2eb (diff) | |
| parent | 5403ca79b225605c79f49866a6497c97da53be3b (diff) | |
Merge remote branch 'origin/master' into glsl2
This pulls in multiple i965 driver fixes which will help ensure better
testing coverage during development, and also gets past the conflicts
of the src/mesa/shader -> src/mesa/program move.
Conflicts:
src/mesa/Makefile
src/mesa/main/shaderapi.c
src/mesa/main/shaderobj.h
Diffstat (limited to 'src/mesa/vbo')
| -rw-r--r-- | src/mesa/vbo/vbo_exec_api.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index 365419d44f..9df75a8406 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -969,7 +969,10 @@ _vbo_Materialfv(GLenum face, GLenum pname, const GLfloat *params) void GLAPIENTRY _vbo_Materialf(GLenum face, GLenum pname, GLfloat param) { - vbo_Materialfv(face, pname, ¶m); + GLfloat p[4]; + p[0] = param; + p[1] = p[2] = p[3] = 0.0F; + vbo_Materialfv(face, pname, p); } |