diff options
author | marha <marha@users.sourceforge.net> | 2013-11-26 08:07:23 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-11-26 08:07:23 +0100 |
commit | cec4285e4e6b06babf340165148ff8c31601b382 (patch) | |
tree | 9e19864958826fb517b22ba224aa713307272687 /mesalib/src/mesa/vbo/vbo_exec_draw.c | |
parent | 0f333fb1102f4886a8ce39f3c09b12e89e5a7f19 (diff) | |
parent | 4042ec939a2cdc8473479c900871c4c8c0b4e818 (diff) | |
download | vcxsrv-cec4285e4e6b06babf340165148ff8c31601b382.tar.gz vcxsrv-cec4285e4e6b06babf340165148ff8c31601b382.tar.bz2 vcxsrv-cec4285e4e6b06babf340165148ff8c31601b382.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
xkeyboard-config mesa git update 26 nov 2013
Diffstat (limited to 'mesalib/src/mesa/vbo/vbo_exec_draw.c')
-rw-r--r-- | mesalib/src/mesa/vbo/vbo_exec_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/vbo/vbo_exec_draw.c b/mesalib/src/mesa/vbo/vbo_exec_draw.c index 1075bd5d4..a96502ffb 100644 --- a/mesalib/src/mesa/vbo/vbo_exec_draw.c +++ b/mesalib/src/mesa/vbo/vbo_exec_draw.c @@ -403,7 +403,7 @@ vbo_exec_vtx_flush(struct vbo_exec_context *exec, GLboolean keepUnmapped) GL_TRUE, 0, exec->vtx.vert_count - 1, - NULL); + NULL, NULL); /* If using a real VBO, get new storage -- unless asked not to. */ |