aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/vbo/vbo_save_api.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-10-19 11:18:56 +0200
committermarha <marha@users.sourceforge.net>2014-10-19 11:18:56 +0200
commit9fc852414dd4e841c4e2229f55a3e41abca64ac5 (patch)
treea524a96442c2a28243826f91f43680f4bcf012d3 /mesalib/src/mesa/vbo/vbo_save_api.c
parent8d44af7cf8bdc4f42223dfef737ebf4e8c7fe55e (diff)
parentfa5a6df66cfe9b19014ea9d2fca35b762f457041 (diff)
downloadvcxsrv-9fc852414dd4e841c4e2229f55a3e41abca64ac5.tar.gz
vcxsrv-9fc852414dd4e841c4e2229f55a3e41abca64ac5.tar.bz2
vcxsrv-9fc852414dd4e841c4e2229f55a3e41abca64ac5.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/mesa/main/bufferobj.c
Diffstat (limited to 'mesalib/src/mesa/vbo/vbo_save_api.c')
-rw-r--r--mesalib/src/mesa/vbo/vbo_save_api.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/mesalib/src/mesa/vbo/vbo_save_api.c b/mesalib/src/mesa/vbo/vbo_save_api.c
index 1c6b91942..848eedaa4 100644
--- a/mesalib/src/mesa/vbo/vbo_save_api.c
+++ b/mesalib/src/mesa/vbo/vbo_save_api.c
@@ -191,9 +191,7 @@ alloc_vertex_store(struct gl_context *ctx)
* user. Perhaps there could be a special number for internal
* buffers:
*/
- vertex_store->bufferobj = ctx->Driver.NewBufferObject(ctx,
- VBO_BUF_ID,
- GL_ARRAY_BUFFER_ARB);
+ vertex_store->bufferobj = ctx->Driver.NewBufferObject(ctx, VBO_BUF_ID);
if (vertex_store->bufferobj) {
save->out_of_memory =
!ctx->Driver.BufferData(ctx,