diff options
author | marha <marha@users.sourceforge.net> | 2014-10-19 11:18:56 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-10-19 11:18:56 +0200 |
commit | 9fc852414dd4e841c4e2229f55a3e41abca64ac5 (patch) | |
tree | a524a96442c2a28243826f91f43680f4bcf012d3 /mesalib/src/mesa/vbo | |
parent | 8d44af7cf8bdc4f42223dfef737ebf4e8c7fe55e (diff) | |
parent | fa5a6df66cfe9b19014ea9d2fca35b762f457041 (diff) | |
download | vcxsrv-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')
-rw-r--r-- | mesalib/src/mesa/vbo/vbo_exec_api.c | 2 | ||||
-rw-r--r-- | mesalib/src/mesa/vbo/vbo_save_api.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/mesalib/src/mesa/vbo/vbo_exec_api.c b/mesalib/src/mesa/vbo/vbo_exec_api.c index 2871100ae..5f8250e78 100644 --- a/mesalib/src/mesa/vbo/vbo_exec_api.c +++ b/mesalib/src/mesa/vbo/vbo_exec_api.c @@ -997,7 +997,7 @@ void vbo_use_buffer_objects(struct gl_context *ctx) /* Allocate a real buffer object now */ _mesa_reference_buffer_object(ctx, &exec->vtx.bufferobj, NULL); - exec->vtx.bufferobj = ctx->Driver.NewBufferObject(ctx, bufName, target); + exec->vtx.bufferobj = ctx->Driver.NewBufferObject(ctx, bufName); if (!ctx->Driver.BufferData(ctx, target, size, NULL, usage, GL_MAP_WRITE_BIT | GL_DYNAMIC_STORAGE_BIT | 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, |